From 7d4b637fa6fe2d2dd1ddf421046a6bcad689738d Mon Sep 17 00:00:00 2001 From: emaryn <197520219+emaryn@users.noreply.github.com> Date: Fri, 14 Feb 2025 00:10:00 +0000 Subject: [PATCH 01/18] gopeed: fix libgopeed --- pkgs/by-name/go/gopeed/package.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix index 7506d33e295f..94637211283a 100644 --- a/pkgs/by-name/go/gopeed/package.nix +++ b/pkgs/by-name/go/gopeed/package.nix @@ -34,8 +34,9 @@ let buildPhase = '' runHook preBuild - mkdir -p $out/lib + mkdir -p $out/lib $out/bin go build -tags nosqlite -ldflags="-w -s -X github.com/GopeedLab/gopeed/pkg/base.Version=v${version}" -buildmode=c-shared -o $out/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop + go build -ldflags="-w -s" -o $out/bin/host github.com/GopeedLab/gopeed/cmd/host runHook postBuild ''; @@ -60,6 +61,7 @@ flutter324.buildFlutterApplication { preBuild = '' mkdir -p linux/bundle/lib cp ${libgopeed}/lib/libgopeed.so linux/bundle/lib/libgopeed.so + cp ${libgopeed}/bin/host assets/host/host ''; postInstall = '' @@ -68,6 +70,11 @@ flutter324.buildFlutterApplication { install -Dm644 assets/icon/icon_1024.png $out/share/icons/hicolor/1024x1024/apps/com.gopeed.Gopeed.png ''; + preFixup = '' + patchelf --add-needed libgopeed.so \ + --add-rpath $out/app/gopeed/lib $out/app/gopeed/gopeed + ''; + passthru.updateScript = ./update.sh; meta = metaCommon // { From 497298a1ad51a67eb51487ffd28b18a18031fc1a Mon Sep 17 00:00:00 2001 From: emaryn <197520219+emaryn@users.noreply.github.com> Date: Fri, 14 Feb 2025 00:10:34 +0000 Subject: [PATCH 02/18] gopeed: 1.6.8 -> 1.6.10 --- pkgs/by-name/go/gopeed/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix index 94637211283a..ae355551d6c5 100644 --- a/pkgs/by-name/go/gopeed/package.nix +++ b/pkgs/by-name/go/gopeed/package.nix @@ -8,13 +8,13 @@ }: let - version = "1.6.8"; + version = "1.6.10"; src = fetchFromGitHub { owner = "GopeedLab"; repo = "gopeed"; tag = "v${version}"; - hash = "sha256-Z6t652m420FcCK4V9sG9I+Dzc2OTyXwWunBhVSreyac="; + hash = "sha256-sTKPSgy1jDavEd/IM8F6dxojp8oOQTo3/w/YV21JR/Q="; }; metaCommon = { From ba58d8a68f59924e2554464657a5de38c937c081 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sun, 16 Feb 2025 15:43:21 +0000 Subject: [PATCH 03/18] arc-browser: 1.81.0-58533 -> 1.82.1-58845 Changelog: https://arc.net/e/22647123-1ABC-48AB-A4C5-9EB704D87AEB --- pkgs/by-name/ar/arc-browser/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index 7549aa197695..dc2dd8e866d7 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.81.0-58533"; + version = "1.82.1-58845"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-FrgarnGFxaB+R9BGRTAIVr8W8GmNHZeVyBxs2mHpU2I="; + hash = "sha256-RsNCPibndoscdlnBe70jmbsa1GrgwpN89+BTywPCBB4="; }; nativeBuildInputs = [ undmg ]; From 3f53891ab3f7a6ed04532afbff57867a382f27fe Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 23 Jan 2025 18:36:24 +0800 Subject: [PATCH 04/18] chglog: init at 0.6.2 --- pkgs/by-name/ch/chglog/package.nix | 36 ++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/ch/chglog/package.nix diff --git a/pkgs/by-name/ch/chglog/package.nix b/pkgs/by-name/ch/chglog/package.nix new file mode 100644 index 000000000000..468ac4b66711 --- /dev/null +++ b/pkgs/by-name/ch/chglog/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "chglog"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "goreleaser"; + repo = "chglog"; + tag = "v${version}"; + hash = "sha256-A6PqsyYfhIu3DF1smD5NRLRwISUB806hMQNtDq0G/8Y="; + }; + + vendorHash = "sha256-CbpSlAQLHRyT5Uo9rY/gr+F2jAcqA9M8E8+l3PncdXE="; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + "-X=main.builtBy=nixpkgs" + ]; + + meta = { + description = "Changelog management library and tool"; + homepage = "https://github.com/goreleaser/chglog"; + changelog = "https://github.com/goreleaser/chglog/releases/tag/v${version}"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ rewine ]; + mainProgram = "chglog"; + }; +} From f9b6a32d96ede1b6586d672aa5dbdbea50f9e0e7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 Feb 2025 20:30:43 +0100 Subject: [PATCH 05/18] python312Packages.onedrive-personal-sdk: 0.0.10 -> 0.0.11 Diff: https://github.com/zweckj/onedrive-personal-sdk/compare/refs/tags/v0.0.10...v0.0.11 Changelog: https://github.com/zweckj/onedrive-personal-sdk/releases/tag/v0.0.11 --- .../python-modules/onedrive-personal-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix index b65780d601b8..53bd78b822fa 100644 --- a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix +++ b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "onedrive-personal-sdk"; - version = "0.0.10"; + version = "0.0.11"; pyproject = true; src = fetchFromGitHub { owner = "zweckj"; repo = "onedrive-personal-sdk"; tag = "v${version}"; - hash = "sha256-8enxmHc4s6bfxeIqOqc9DpT3pKIwocIsO3hYrK3G7CM="; + hash = "sha256-4/v1kAgpg/D7HPTirS+HBs46Vs/OK81MzUW8ixhzU+Y="; }; build-system = [ setuptools ]; From 7712e9ffa52915c6addac83148df5f120312522d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 21 Feb 2025 00:18:00 +0100 Subject: [PATCH 06/18] python312Packages.cvxpy: 1.6.0 -> 1.6.1 Diff: https://github.com/cvxpy/cvxpy/compare/refs/tags/v1.6.0...v1.6.1 Changelog: https://github.com/cvxpy/cvxpy/releases/tag/v1.6.1 --- pkgs/development/python-modules/cvxpy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index bd32bc8ebedb..522a3b158c88 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.6.0"; + version = "1.6.1"; pyproject = true; src = fetchFromGitHub { owner = "cvxpy"; repo = "cvxpy"; tag = "v${version}"; - hash = "sha256-t2+j0ZrvGvTv6FoNVpD2MVFZKfGgqTaN32OKwBXM3Zw="; + hash = "sha256-r354ShPTMsnCCCTKYH+IbDWIlbPAhg1PqQTWG/sEzWE="; }; # we need to patch out numpy version caps from upstream @@ -88,7 +88,7 @@ buildPythonPackage rec { description = "Domain-specific language for modeling convex optimization problems in Python"; homepage = "https://www.cvxpy.org/"; downloadPage = "https://github.com/cvxpy/cvxpy//releases"; - changelog = "https://github.com/cvxpy/cvxpy/releases/tag/${src.tag}"; + changelog = "https://github.com/cvxpy/cvxpy/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ drewrisinger ]; }; From 5837cd48c2d58c3da3507ae6c8e92af42a7393ad Mon Sep 17 00:00:00 2001 From: Bonus Date: Mon, 25 Nov 2024 01:27:44 +0100 Subject: [PATCH 07/18] mautrix-slack: init at 0.1.4 --- pkgs/by-name/ma/mautrix-slack/package.nix | 48 +++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/ma/mautrix-slack/package.nix diff --git a/pkgs/by-name/ma/mautrix-slack/package.nix b/pkgs/by-name/ma/mautrix-slack/package.nix new file mode 100644 index 000000000000..4dc71fdd9cd0 --- /dev/null +++ b/pkgs/by-name/ma/mautrix-slack/package.nix @@ -0,0 +1,48 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + olm, + nix-update-script, + versionCheckHook, + # This option enables the use of an experimental pure-Go implementation of + # the Olm protocol instead of libolm for end-to-end encryption. Using goolm + # is not recommended by the mautrix developers, but they are interested in + # people trying it out in non-production-critical environments and reporting + # any issues they run into. + withGoolm ? false, +}: +let + version = "0.1.4"; +in +buildGoModule { + pname = "mautrix-slack"; + inherit version; + + src = fetchFromGitHub { + owner = "mautrix"; + repo = "slack"; + tag = "v${version}"; + hash = "sha256-MDbWvbEY8+CrUL1SnjdJ4SqyOH/5gPsEQkLnTHyJdOo="; + }; + + vendorHash = "sha256-8U6ifMLRF7PJyG3hWKgBtj/noO/eCXXD60aeB4p2W54="; + + buildInputs = lib.optional (!withGoolm) olm; + tags = lib.optional withGoolm "goolm"; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Matrix-Slack puppeting bridge"; + homepage = "https://github.com/mautrix/slack"; + changelog = "https://github.com/mautrix/slack/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ BonusPlay ]; + mainProgram = "mautrix-slack"; + }; +} From 67e1402464a88895f40edc34aeab6d073d3294f5 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 21 Feb 2025 02:02:52 +0200 Subject: [PATCH 08/18] catppuccin: unstable-2024-03-12 -> unstable-2025-02-21 --- pkgs/by-name/ca/catppuccin/package.nix | 68 +++++++++++++------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/ca/catppuccin/package.nix b/pkgs/by-name/ca/catppuccin/package.nix index 069c9a326961..9c74ab9413f6 100644 --- a/pkgs/by-name/ca/catppuccin/package.nix +++ b/pkgs/by-name/ca/catppuccin/package.nix @@ -58,64 +58,64 @@ let name = "bat"; owner = "catppuccin"; repo = "bat"; - rev = "2bafe4454d8db28491e9087ff3a1382c336e7d27"; - hash = "sha256-yHt3oIjUnljARaihalcWSNldtaJfVDfmfiecYfbzGs0="; + rev = "699f60fc8ec434574ca7451b444b880430319941"; + hash = "sha256-6fWoCH90IGumAMc4buLRWL0N61op+AuMNN9CAR9/OdI="; }; bottom = fetchFromGitHub { name = "bottom"; owner = "catppuccin"; repo = "bottom"; - rev = "c0efe9025f62f618a407999d89b04a231ba99c92"; - hash = "sha256-VaHX2I/Gn82wJWzybpWNqU3dPi3206xItOlt0iF6VVQ="; + rev = "ed09bd5a5dd78d83acdc8ff5fdec40a6340ed1c2"; + hash = "sha256-Vi438I+YVvoD2xzq2t9hJ9R3a+2TlDdbakjFYFtjtXQ="; }; btop = fetchFromGitHub { name = "btop"; owner = "catppuccin"; repo = "btop"; - rev = "1.0.0"; - hash = "sha256-J3UezOQMDdxpflGax0rGBF/XMiKqdqZXuX4KMVGTxFk="; + rev = "f437574b600f1c6d932627050b15ff5153b58fa3"; + hash = "sha256-mEGZwScVPWGu+Vbtddc/sJ+mNdD2kKienGZVUcTSl+c="; }; grub = fetchFromGitHub { name = "grub"; owner = "catppuccin"; repo = "grub"; - rev = "v1.0.0"; - hash = "sha256-/bSolCta8GCZ4lP0u5NVqYQ9Y3ZooYCNdTwORNvR7M0="; + rev = "2a5c8be8185dae49dd22030df45860df8c796312"; + hash = "sha256-20D1EcV8SWOd5BLdAc6FaQu3onha0+aS5yA/GK8Ra0g="; }; hyprland = fetchFromGitHub { name = "hyprland"; owner = "catppuccin"; repo = "hyprland"; - rev = "v1.2"; - hash = "sha256-07B5QmQmsUKYf38oWU3+2C6KO4JvinuTwmW1Pfk8CT8="; + rev = "c388ac55563ddeea0afe9df79d4bfff0096b146b"; + hash = "sha256-xSa/z0Pu+ioZ0gFH9qSo9P94NPkEMovstm1avJ7rvzM="; }; k9s = fetchFromGitHub { name = "k9s"; owner = "catppuccin"; repo = "k9s"; - rev = "590a762110ad4b6ceff274265f2fe174c576ce96"; - hash = "sha256-EBDciL3F6xVFXvND+5duT+OiVDWKkFMWbOOSruQ0lus="; + rev = "fdbec82284744a1fc2eb3e2d24cb92ef87ffb8b4"; + hash = "sha256-9h+jyEO4w0OnzeEKQXJbg9dvvWGZYQAO4MbgDn6QRzM="; }; kvantum = fetchFromGitHub { name = "kvantum"; owner = "catppuccin"; repo = "Kvantum"; - rev = "d1e174c85311de9715aefc1eba4b8efd6b2730fc"; - hash = "sha256-IrHo8pnR3u90bq12m7FEXucUF79+iub3I9vgH5h86Lk="; + rev = "a87694e0a3c97644dbb34f8835112d17b54ace68"; + hash = "sha256-eQmEeKC+L408ajlNg3oKMnDK6Syy2GV6FrR2TN5ZBCg="; }; lazygit = fetchFromGitHub { name = "lazygit"; owner = "catppuccin"; repo = "lazygit"; - rev = "v2.0.0"; - hash = "sha256-gM0HplHhcpvtpmIVdlX/p59h0v+ihKEidS1imqPYlBg="; + rev = "d3c95a67ea3f778f7705d8ef814f87ac5213436d"; + hash = "sha256-b2SoIeXT1BaoxvEeQ0VaPmnBND+7qUe342kOIkyOcAc="; }; lxqt = fetchFromGitHub { @@ -130,16 +130,16 @@ let name = "plymouth"; owner = "catppuccin"; repo = "plymouth"; - rev = "67759fbe15eb9490d096ef8014d9f92fc5748fe7"; - hash = "sha256-IzoyVOi44Uay7DTfzR9RdRLSjORsdBM4pPrgeXk5YMI="; + rev = "e0f58d6fcf3dbc2d35dfc4fec394217fbfa92666"; + hash = "sha256-He6ER1QNrJCUthFoBBGHBINouW/tozxQy3R79F5tsuo="; }; qt5ct = fetchFromGitHub { name = "qt5ct"; owner = "catppuccin"; repo = "qt5ct"; - rev = "89ee948e72386b816c7dad72099855fb0d46d41e"; - hash = "sha256-t/uyK0X7qt6qxrScmkTU2TvcVJH97hSQuF0yyvSO/qQ="; + rev = "0442cc931390c226d143e3a6d6e77f819c68502a"; + hash = "sha256-hXyPuI225WdMuVSeX1AwrylUzNt0VA33h8C7MoSJ+8A="; }; refind = fetchFromGitHub { @@ -154,32 +154,32 @@ let name = "rofi"; owner = "catppuccin"; repo = "rofi"; - rev = "5350da41a11814f950c3354f090b90d4674a95ce"; - hash = "sha256-DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY="; + rev = "c24a212a6b07c2d45f32d01d7f10b4d88ddc9f45"; + hash = "sha256-WGYEA4Q7UvSaRDjP/DiEtfXjvmWbewtdyJWRpjhbZgg="; }; starship = fetchFromGitHub { name = "starship"; owner = "catppuccin"; repo = "starship"; - rev = "5629d2356f62a9f2f8efad3ff37476c19969bd4f"; - hash = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0="; + rev = "e99ba6b210c0739af2a18094024ca0bdf4bb3225"; + hash = "sha256-1w0TJdQP5lb9jCrCmhPlSexf0PkAlcz8GBDEsRjPRns="; }; thunderbird = fetchFromGitHub { name = "thunderbird"; owner = "catppuccin"; repo = "thunderbird"; - rev = "d61882ad9fd35909a75da6bb95fca38db552135c"; - hash = "sha256-wn8//8lHScbbB1nEiDY8DphnLUMKZBFMc1GPaTRjTOY="; + rev = "0289f3bd9566f9666682f66a3355155c0d0563fc"; + hash = "sha256-07gT37m1+OhRTbUk51l0Nhx+I+tl1il5ayx2ow23APY="; }; waybar = fetchFromGitHub { name = "waybar"; owner = "catppuccin"; repo = "waybar"; - rev = "v1.0"; - hash = "sha256-vfwfBE3iqIN1cGoItSssR7h0z6tuJAhNarkziGFlNBw="; + rev = "v1.1"; + hash = "sha256-9lY+v1CTbpw2lREG/h65mLLw5KuT8OJdEPOb+NNC6Fo="; }; }; in @@ -195,7 +195,7 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO stdenvNoCC.mkDerivation { inherit pname; - version = "unstable-2024-03-12"; + version = "unstable-2025-02-21"; srcs = selectedSources; @@ -247,7 +247,7 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO '' + lib.optionalString (lib.elem "kvantum" themeList) '' mkdir -p $out/share/Kvantum - cp -r ${sources.kvantum}/src/Catppuccin-"$capitalizedVariant"-"$capitalizedAccent" $out/share/Kvantum + cp -r "${sources.kvantum}/themes/catppuccin-${variant}-${accent}" $out/share/Kvantum '' + lib.optionalString (lib.elem "lazygit" themeList) '' @@ -269,12 +269,12 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO '' + lib.optionalString (lib.elem "qt5ct" themeList) '' mkdir -p $out/qt5ct - cp ${sources.qt5ct}/themes/Catppuccin-"$capitalizedVariant".conf $out/qt5ct/ + cp "${sources.qt5ct}/themes/Catppuccin-${variant}-${accent}.conf" "$out/qt5ct" '' + lib.optionalString (lib.elem "rofi" themeList) '' mkdir -p $out/rofi - cp ${sources.rofi}/basic/.local/share/rofi/themes/catppuccin-${variant}.rasi $out/rofi/ + cp "${sources.rofi}/themes/catppuccin-${variant}.rasi" "$out/rofi" '' + lib.optionalString (lib.elem "refind" themeList) '' @@ -285,7 +285,7 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO '' + lib.optionalString (lib.elem "starship" themeList) '' mkdir -p $out/starship - cp ${sources.starship}/palettes/${variant}.toml $out/starship/ + cp "${sources.starship}/themes/${variant}.toml" "$out/starship" '' + lib.optionalString (lib.elem "thunderbird" themeList) '' @@ -295,7 +295,7 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO '' + lib.optionalString (lib.elem "waybar" themeList) '' mkdir -p $out/waybar - cp ${sources.waybar}/${variant}.css $out/waybar/ + cp "${sources.waybar}/themes/${variant}.css" "$out/waybar" '' + '' From 461461526efa196ec94bfa33978d1c2f16ea7612 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 21 Feb 2025 02:12:33 +0200 Subject: [PATCH 09/18] catppuccin: quote paths --- pkgs/by-name/ca/catppuccin/package.nix | 44 +++++++++++++------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/ca/catppuccin/package.nix b/pkgs/by-name/ca/catppuccin/package.nix index 9c74ab9413f6..a5fcd119843d 100644 --- a/pkgs/by-name/ca/catppuccin/package.nix +++ b/pkgs/by-name/ca/catppuccin/package.nix @@ -215,86 +215,86 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO '' + lib.optionalString (lib.elem "bat" themeList) '' - mkdir -p $out/bat + mkdir -p "$out/bat" cp "${sources.bat}/themes/Catppuccin "$capitalizedVariant".tmTheme" "$out/bat/" '' + lib.optionalString (lib.elem "btop" themeList) '' - mkdir -p $out/btop + mkdir -p "$out/btop" cp "${sources.btop}/themes/catppuccin_${variant}.theme" "$out/btop/" '' + lib.optionalString (lib.elem "bottom" themeList) '' - mkdir -p $out/bottom + mkdir -p "$out/bottom" cp "${sources.bottom}/themes/${variant}.toml" "$out/bottom/" '' + lib.optionalString (lib.elem "grub" themeList) '' - mkdir -p $out/grub - cp -r ${sources.grub}/src/catppuccin-${variant}-grub-theme/* "$out/grub/" + mkdir -p "$out/grub" + cp -r "${sources.grub}/src/catppuccin-${variant}-grub-theme/"* "$out/grub/" '' + lib.optionalString (lib.elem "hyprland" themeList) '' - mkdir -p $out/hyprland + mkdir -p "$out/hyprland" cp "${sources.hyprland}/themes/${variant}.conf" "$out/hyprland/" '' + lib.optionalString (lib.elem "k9s" themeList) '' - mkdir -p $out/k9s + mkdir -p "$out/k9s" cp "${sources.k9s}/dist/catppuccin-${variant}.yaml" "$out/k9s/" cp "${sources.k9s}/dist/catppuccin-${variant}-transparent.yaml" "$out/k9s/" '' + lib.optionalString (lib.elem "kvantum" themeList) '' - mkdir -p $out/share/Kvantum - cp -r "${sources.kvantum}/themes/catppuccin-${variant}-${accent}" $out/share/Kvantum + mkdir -p "$out/share/Kvantum" + cp -r "${sources.kvantum}/themes/catppuccin-${variant}-${accent}" "$out/share/Kvantum" '' + lib.optionalString (lib.elem "lazygit" themeList) '' - mkdir -p $out/lazygit/{themes,themes-mergable} + mkdir -p "$out/lazygit/"{themes,themes-mergable} cp "${sources.lazygit}/themes/${variant}/${accent}.yml" "$out/lazygit/themes/" cp "${sources.lazygit}/themes-mergable/${variant}/${accent}.yml" "$out/lazygit/themes-mergable/" '' + lib.optionalString (lib.elem "lxqt" themeList) '' - mkdir -p $out/share/lxqt/themes/catppuccin-${variant} - cp -r ${sources.lxqt}/src/catppuccin-${variant}/* $out/share/lxqt/themes/catppuccin-${variant}/ + mkdir -p "$out/share/lxqt/themes/catppuccin-${variant}" + cp -r "${sources.lxqt}/src/catppuccin-${variant}/"* "$out/share/lxqt/themes/catppuccin-${variant}" '' + lib.optionalString (lib.elem "plymouth" themeList) '' - mkdir -p $out/share/plymouth/themes/catppuccin-${variant} + mkdir -p "$out/share/plymouth/themes/catppuccin-${variant}" cp ${sources.plymouth}/themes/catppuccin-${variant}/* $out/share/plymouth/themes/catppuccin-${variant} sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' $out/share/plymouth/themes/catppuccin-${variant}/catppuccin-${variant}.plymouth '' + lib.optionalString (lib.elem "qt5ct" themeList) '' - mkdir -p $out/qt5ct + mkdir -p "$out/qt5ct" cp "${sources.qt5ct}/themes/Catppuccin-${variant}-${accent}.conf" "$out/qt5ct" '' + lib.optionalString (lib.elem "rofi" themeList) '' - mkdir -p $out/rofi + mkdir -p "$out/rofi" cp "${sources.rofi}/themes/catppuccin-${variant}.rasi" "$out/rofi" '' + lib.optionalString (lib.elem "refind" themeList) '' - mkdir -p $out/refind/assets - cp ${sources.refind}/${variant}.conf $out/refind/ - cp -r ${sources.refind}/assets/${variant} $out/refind/assets/ + mkdir -p "$out/refind/assets" + cp "${sources.refind}/${variant}.conf" "$out/refind" + cp -r "${sources.refind}/assets/${variant}" "$out/refind/assets" '' + lib.optionalString (lib.elem "starship" themeList) '' - mkdir -p $out/starship + mkdir -p "$out/starship" cp "${sources.starship}/themes/${variant}.toml" "$out/starship" '' + lib.optionalString (lib.elem "thunderbird" themeList) '' - mkdir -p $out/thunderbird - cp ${sources.thunderbird}/themes/${variant}/${variant}-${accent}.xpi $out/thunderbird/ + mkdir -p "$out/thunderbird" + cp "${sources.thunderbird}/themes/${variant}/${variant}-${accent}.xpi" "$out/thunderbird" '' + lib.optionalString (lib.elem "waybar" themeList) '' - mkdir -p $out/waybar + mkdir -p "$out/waybar" cp "${sources.waybar}/themes/${variant}.css" "$out/waybar" '' From f998a07d73b057ee168f9b08fa61bdde501a6631 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 21 Feb 2025 01:57:15 +0100 Subject: [PATCH 10/18] python313Packages.aiojellyfin: 0.13.0 -> 0.14.1 https://github.com/Jc2k/aiojellyfin/blob/v0.14.1/CHANGELOG.md --- pkgs/development/python-modules/aiojellyfin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiojellyfin/default.nix b/pkgs/development/python-modules/aiojellyfin/default.nix index 20241ad0064d..6db4d9c66c59 100644 --- a/pkgs/development/python-modules/aiojellyfin/default.nix +++ b/pkgs/development/python-modules/aiojellyfin/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "aiojellyfin"; - version = "0.13.0"; + version = "0.14.1"; pyproject = true; src = fetchFromGitHub { owner = "Jc2k"; repo = "aiojellyfin"; tag = "v${version}"; - hash = "sha256-M9GsXcm2PM3blkMBMrjyagzcWpyt/WqMeM8xU/KNPks="; + hash = "sha256-C2jIP2q+1z6iQoK18jRVaFKXtxyF1RXZMtXWakx7qO0="; }; build-system = [ setuptools ]; From f81a2066f9b104a8f556099575e4672cfd4a3d88 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 21 Feb 2025 01:58:10 +0100 Subject: [PATCH 11/18] python313Packages.teslemetry-stream: 0.6.10 -> 0.6.12 https://github.com/Teslemetry/python-teslemetry-stream/releases/tag/v0.6.12 --- pkgs/development/python-modules/teslemetry-stream/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teslemetry-stream/default.nix b/pkgs/development/python-modules/teslemetry-stream/default.nix index 140da66dfb63..ef54a6fe4372 100644 --- a/pkgs/development/python-modules/teslemetry-stream/default.nix +++ b/pkgs/development/python-modules/teslemetry-stream/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "teslemetry-stream"; - version = "0.6.10"; + version = "0.6.12"; pyproject = true; src = fetchFromGitHub { owner = "Teslemetry"; repo = "python-teslemetry-stream"; tag = "v${version}"; - hash = "sha256-HYOjmFVyPPQ+NizmEhrse868IELHn0fGfr55MwTpP3w="; + hash = "sha256-0Ca8p5xuzpSfZhtTYZUgbdNHXmnn9RLOGMTSYKfnUZg="; }; build-system = [ setuptools ]; From 6422cfc497e6f2983f4b8a764fa4a3b86bf70858 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 21 Feb 2025 02:06:11 +0100 Subject: [PATCH 12/18] python313Packages.pyopenweathermap: 0.2.1 -> 0.2.2 https://github.com/freekode/pyopenweathermap/compare/refs/tags/v0.2.1...v0.2.2 --- pkgs/development/python-modules/pyopenweathermap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopenweathermap/default.nix b/pkgs/development/python-modules/pyopenweathermap/default.nix index fcdda39f9fd3..d1ddbddf51ff 100644 --- a/pkgs/development/python-modules/pyopenweathermap/default.nix +++ b/pkgs/development/python-modules/pyopenweathermap/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyopenweathermap"; - version = "0.2.1"; + version = "0.2.2"; pyproject = true; src = fetchFromGitHub { @@ -24,7 +24,7 @@ buildPythonPackage rec { repo = "pyopenweathermap"; # https://github.com/freekode/pyopenweathermap/issues/2 tag = "v${version}"; - hash = "sha256-UcnELAJf0Ltf0xJOlyzsHb4HQGSBTJ+/mOZ/XSTkA0w="; + hash = "sha256-i/oqjrViATNR+HuG72ZdPMJF9TJf7B1pi+wqCth34OU="; }; build-system = [ poetry-core ]; From 178a2484daf9698a514e1ef50d968d912354cf2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Feb 2025 01:23:14 +0000 Subject: [PATCH 13/18] servo: 0-unstable-2025-02-19 -> 0-unstable-2025-02-20 --- pkgs/by-name/se/servo/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index 230437090a66..14a305602229 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -62,17 +62,17 @@ in rustPlatform.buildRustPackage { pname = "servo"; - version = "0-unstable-2025-02-19"; + version = "0-unstable-2025-02-20"; src = fetchFromGitHub { owner = "servo"; repo = "servo"; - rev = "5ff588429f3912c08d7f744a9cccfeae392592cd"; - hash = "sha256-URX/jc6zr7BCENYmwO4h7SWLp/+wsVJNyyoCcXpvVEs="; + rev = "54b5c7b632ecb48f134b232ee1b9aa8bc8c286c0"; + hash = "sha256-MHxGL7NFa6+QexeBITy0WPcBLCO6NrnPOEBlJMF7iZA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bwg1FipNkdAI+1V2PhppP31nOCUPl7vKBrroFjlvq2Y="; + cargoHash = "sha256-ZVHM+z1ZYAu6GIar602FoAB77EhbjV3Mf9oFHe5q3LY="; postPatch = '' # Remap absolute path between modules to include SEMVER From 1d50dcd57199c8658ef6c6c178e04d8edf3165e0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 21 Feb 2025 02:33:16 +0100 Subject: [PATCH 14/18] python313Packages.click-datetime: 0.2.0 -> 0.4.0 https://github.com/click-contrib/click-datetime/compare/0.2.0...942964cf71b5c43a542e63e634c934ab29d3daf3 --- .../python-modules/click-datetime/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/click-datetime/default.nix b/pkgs/development/python-modules/click-datetime/default.nix index 2203bfb82963..b5c2e3774f38 100644 --- a/pkgs/development/python-modules/click-datetime/default.nix +++ b/pkgs/development/python-modules/click-datetime/default.nix @@ -1,23 +1,27 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchPypi, + poetry-core, click, }: buildPythonPackage rec { pname = "click-datetime"; - version = "0.2.0"; - format = "setuptools"; + version = "0.4.0"; + pyproject = true; - src = fetchFromGitHub { - owner = "click-contrib"; - repo = pname; - rev = version; - sha256 = "1yxagk4wd2h77nxml19bn2y26fv2xw2n9g981ls8mjy0g51ms3gh"; + src = fetchPypi { + pname = "click_datetime"; + inherit version; + hash = "sha256-nzXtP6sT9VMiHOjFqJXlGF1zYJk8Ud1/hii5tPY2kws="; }; - propagatedBuildInputs = [ click ]; + build-system = [ poetry-core ]; + + pythonRemoveDeps = [ "wheel" ]; + + dependencies = [ click ]; # no tests doCheck = false; From fd7567582546877fce5577bfa8bdeea6e78a765e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 21 Feb 2025 02:40:24 +0100 Subject: [PATCH 15/18] python313Packages.paypalhttp: fix http header case issue --- pkgs/development/python-modules/paypalhttp/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/paypalhttp/default.nix b/pkgs/development/python-modules/paypalhttp/default.nix index 3563bb7454ee..4665571bc18a 100644 --- a/pkgs/development/python-modules/paypalhttp/default.nix +++ b/pkgs/development/python-modules/paypalhttp/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # propagates pyopenssl, @@ -25,6 +26,14 @@ buildPythonPackage rec { hash = "sha256-3ihcpYtpcejPkiyf4g4jveyNU6flQB2sv9EZ5Pd7tUc="; }; + patches = [ + (fetchpatch2 { + # fix content-type header case sensitiyivy + url = "https://github.com/paypal/paypalhttp_python/commit/72609783230663b8e34c6f0384837db7b166c8f4.patch"; + hash = "sha256-K2hO3XRrJ+Gm+rLtWRPy0E2syLS4RhNNHIA3w4xVYtY="; + }) + ]; + postPatch = '' substituteInPlace tests/http_response_test.py \ --replace-fail assertEquals assertEqual From baf59e4eb8d26fc8901f6e4e98350f413cd49523 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 21 Feb 2025 02:52:49 +0100 Subject: [PATCH 16/18] python313Packages.pymicro-vad: 1.0.1 -> 1.0.2 https://github.com/rhasspy/pymicro-vad/releases/tag/1.0.2 --- pkgs/development/python-modules/pymicro-vad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymicro-vad/default.nix b/pkgs/development/python-modules/pymicro-vad/default.nix index 1e59d53b6e9c..ca4064261e7a 100644 --- a/pkgs/development/python-modules/pymicro-vad/default.nix +++ b/pkgs/development/python-modules/pymicro-vad/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pymicro-vad"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "pymicro-vad"; tag = version; - hash = "sha256-wpsUy+f4eSGlq6L2FOtnA0qJgMh5ZdfiH31aaU61cVw="; + hash = "sha256-yKy/oD6nl2qZW64+aAHZRAEFextCXT6RpMfPThB8DXE="; }; build-system = [ From dd34c8e8bce8a1a80c37d929208b7d8f6a6f438c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Feb 2025 02:11:50 +0000 Subject: [PATCH 17/18] halloy: 2025.1 -> 2025.2 --- pkgs/by-name/ha/halloy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix index 46a52e603cf8..17c92f3ef323 100644 --- a/pkgs/by-name/ha/halloy/package.nix +++ b/pkgs/by-name/ha/halloy/package.nix @@ -18,17 +18,17 @@ rustPlatform.buildRustPackage rec { pname = "halloy"; - version = "2025.1"; + version = "2025.2"; src = fetchFromGitHub { owner = "squidowl"; repo = "halloy"; tag = version; - hash = "sha256-QBuZFlZf9ORXJU9CXi0a7IQcmTqHgOi4Eqd5pKWdU1g="; + hash = "sha256-ijSUGiAowxSqYwH3OxSWiGvm99n88ETJxAFn5x4m/BE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-+nNJPeQno6xTa42jBIaNWTzvoKWMSrfdCKBgMs1vPYU="; + cargoHash = "sha256-j4lx3sSQZ7BKl+d5nFJQkMhgQWjn0xkNNCWMlbKLwVQ="; nativeBuildInputs = [ copyDesktopItems From e7d9d982ffea3fec781a0c1dcadfacb7a8ae930e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Feb 2025 02:24:56 +0000 Subject: [PATCH 18/18] violet: 0.5.2 -> 0.5.3 --- pkgs/by-name/vi/violet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/violet/package.nix b/pkgs/by-name/vi/violet/package.nix index a5d21a55c77d..522f49c8ab45 100644 --- a/pkgs/by-name/vi/violet/package.nix +++ b/pkgs/by-name/vi/violet/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "violet"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "paullouisageneau"; repo = "violet"; rev = "v${finalAttrs.version}"; - hash = "sha256-A/OBp5IsExRymX8TFG62EbWexu9InYbcLwB6mCpyYhg="; + hash = "sha256-aoBTmhz/rwz2ucRrRti3K8SYt9D/EBPn6s5iTjQ9bpQ="; fetchSubmodules = true; };