From 980ab5c74c0429b2ae5bc8b4f1a4e63f2181823f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Dec 2022 11:50:56 +0000 Subject: [PATCH 1/6] python310Packages.apycula: 0.5.1 -> 0.6.1 --- pkgs/development/python-modules/apycula/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index 0e68a347d46b..4347fd925dc1 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.5.1"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-icyIvnvHJSZKI59c3YexHoqDPf8Phhn9+x17Wr17aQ8="; + hash = "sha256-/XQ/Q4/LzCBDaTindbBENOh5OSIH2JPLyiYFWT9DcP4="; }; nativeBuildInputs = [ From d5510e9e9e3e9db3d35fea2af012c76d6af1c173 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 24 Dec 2022 21:45:48 +0800 Subject: [PATCH 2/6] cinnamon.cinnamon-common: Fix settings theme thumbnail path We look for globally installed themes with this path, so we use /run/current-system/sw/share. --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 99df41605326..c0c63675cb50 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -151,6 +151,8 @@ stdenv.mkDerivation rec { sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py + sed "s|/usr/share/%s|/run/current-system/sw/share/%s|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py + sed "s|\"upload-system-info\"|\"${xapp}/bin/upload-system-info\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py sed "s|/usr/bin/cinnamon-screensaver-command|/run/current-system/sw/bin/cinnamon-screensaver-command|g" \ From 0ac48ac9327cd30cbb2c9301806df409c5d6e4b8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 24 Dec 2022 22:46:53 +0800 Subject: [PATCH 3/6] cinnamon.cinnamon-screensaver: Fix crash with virtual keyboard Caribou.KeyboardModel is also used here, so we apply the same fix for cinnamon-common to get rid of a crash. --- pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index dca6169b0da5..981b6a5d4578 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -93,6 +93,13 @@ stdenv.mkDerivation rec { sed "s|/usr/share/locale|/run/current-system/sw/share/locale|g" -i ./src/cinnamon-screensaver-main.py ''; + preFixup = '' + # https://github.com/NixOS/nixpkgs/issues/101881 + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gnome.caribou}/share" + ) + ''; + meta = with lib; { homepage = "https://github.com/linuxmint/cinnamon-screensaver"; description = "The Cinnamon screen locker and screensaver program"; From efcc85edb35eba0c8f91030ff461964fff19d569 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Dec 2022 18:04:36 +0000 Subject: [PATCH 4/6] ocm: 0.1.64 -> 0.1.65 --- pkgs/applications/networking/cluster/ocm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/ocm/default.nix b/pkgs/applications/networking/cluster/ocm/default.nix index 46fdeef2ac83..4c4ececb71ef 100644 --- a/pkgs/applications/networking/cluster/ocm/default.nix +++ b/pkgs/applications/networking/cluster/ocm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ocm"; - version = "0.1.64"; + version = "0.1.65"; src = fetchFromGitHub { owner = "openshift-online"; repo = "ocm-cli"; rev = "v${version}"; - sha256 = "sha256-RMXiEXgf8tAdp2d97kaOzXgFCFVkaMhkJF8AHXIEJm8="; + sha256 = "sha256-UzHGVK/HZ5eH8nO4+G92NunOQi9AWnqv4vgcHjtoPDw="; }; - vendorSha256 = "sha256-4m5Ej2Ql9+wGqrzvXQkY8fL2I9tYE6Tm6s9+qcZBHQI="; + vendorSha256 = "sha256-4pqXap1WayqdXuwwLktE71D7x6Ao9MkIKSzIKtVyP84="; # Strip the final binary. ldflags = [ "-s" "-w" ]; From 29e09b1d0c0d3abab49898d71db345ad8335252f Mon Sep 17 00:00:00 2001 From: Madoura Date: Sat, 24 Dec 2022 16:55:47 -0600 Subject: [PATCH 5/6] hydron: 3.3.5 -> 3.3.6 This is the final update, hydron is now archived. --- pkgs/servers/hydron/default.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 03236b410824..453557d109ac 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -1,25 +1,36 @@ -{ lib, buildGoModule, fetchFromGitHub, pkg-config, ffmpeg }: +{ lib +, buildGoModule +, fetchFromGitHub +, gitUpdater +, pkg-config +, ffmpeg +}: buildGoModule rec { pname = "hydron"; - version = "3.3.5"; + version = "3.3.6"; src = fetchFromGitHub { owner = "bakape"; repo = "hydron"; rev = "v${version}"; - sha256 = "0c958dsw5pq9z8n1b9q9j8y6vgiqf6mmlsf77ncb7yrlilhbrz6s"; + hash = "sha256-Q1pZf5FPQw+pHItcZyOGx0N+iHmz9rW0+ANFsketh6E="; }; - vendorSha256 = "0cc8ar8p7lgg6rj76vhfp6bzrxyn5yaqjwj8i1bn0zp6sj6zcfam"; + vendorHash = "sha256-fyGC6k9/xER5GwVelBhy5C5tiq6NMhwSmYjSpvenrfA="; proxyVendor = true; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ffmpeg ]; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = with lib; { homepage = "https://github.com/bakape/hydron"; description = "High performance media tagger and organizer"; - license = licenses.lgpl3Plus; + license = with licenses; [ lgpl3Plus ]; maintainers = with maintainers; [ Madouura ]; }; } From e4445d3fa49340a4f9c36e596d4466a0675bd7b8 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sat, 24 Dec 2022 21:56:09 -0500 Subject: [PATCH 6/6] cirrus-cli: 0.93.0 -> 0.94.4 Diff: https://github.com/cirruslabs/cirrus-cli/compare/v0.93.0...v0.94.4 --- .../tools/continuous-integration/cirrus-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 37b36ff3ed5b..2a7111b352ec 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.93.0"; + version = "0.94.4"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-exGOCBKPHuVBaFXd+/jbjAid7ZDodtZ/h/OWp/NBOhE="; + sha256 = "sha256-PnO9M3CQQnZotzCuE2rlGsoBzNO0PdsoMLlY3tNyEyk="; }; vendorSha256 = "sha256-gotc9M2UkRJtE4LZPCpqDTXQ/cnN4tk+3HG243tFoss=";