simpledbus: 0.10.4 -> 0.11.0, simplebluez: 0.7.3 -> 0.11.0, zmkbatx: fix build (#486879)
This commit is contained in:
@@ -8,15 +8,15 @@
|
||||
lib,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "simpleBluez";
|
||||
pname = "simplebluez";
|
||||
|
||||
version = "0.7.3";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenBluetoothToolbox";
|
||||
repo = "SimpleBLE";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-CPBdPnBeQ0c3VjSX0Op6nCHF3w0MdXGULbk1aavr+LM=";
|
||||
hash = "sha256-SWZdVWBC8udwkn195FdvsXSniMtzd8+WfnMsARLYSQ4=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -40,7 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "C++ abstraction layer for BlueZ over DBus";
|
||||
homepage = "https://github.com/OpenBluetoothToolbox/SimpleBLE";
|
||||
license = lib.licenses.gpl3Only;
|
||||
# SimpleBLE (which SimpleBluez is part of) is under the Business Source License 1.1 (BUSL-1.1)
|
||||
# since version 0.9.0
|
||||
license = lib.licenses.bsl11;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ aciceri ];
|
||||
};
|
||||
@@ -10,13 +10,13 @@
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "simpledbus";
|
||||
|
||||
version = "0.10.4";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenBluetoothToolbox";
|
||||
repo = "SimpleBLE";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-KNSrw+NhfHRuvDwkWpWTSnP6LWoSVWAa33fVikb60A8=";
|
||||
hash = "sha256-SWZdVWBC8udwkn195FdvsXSniMtzd8+WfnMsARLYSQ4=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -5,11 +5,23 @@
|
||||
qt6,
|
||||
pkg-config,
|
||||
dbus,
|
||||
simpleBluez,
|
||||
simplebluez,
|
||||
simpledbus,
|
||||
}:
|
||||
let
|
||||
# zmkBATx is incompatible against the new ABI
|
||||
simplebluez' = simplebluez.overrideAttrs rec {
|
||||
version = "0.7.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenBluetoothToolbox";
|
||||
repo = "SimpleBLE";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CPBdPnBeQ0c3VjSX0Op6nCHF3w0MdXGULbk1aavr+LM=";
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zmkBATx";
|
||||
pname = "zmkbatx";
|
||||
|
||||
version = "1.0.1";
|
||||
|
||||
@@ -30,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qt6.qtbase
|
||||
qt6.qtconnectivity
|
||||
dbus.lib
|
||||
simpleBluez
|
||||
simpledbus
|
||||
simplebluez'
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -1738,6 +1738,7 @@ mapAliases {
|
||||
siduck76-st = throw "'siduck76-st' has been renamed to/replaced by 'st-snazzy'"; # Converted to throw 2025-10-27
|
||||
sierra-breeze-enhanced = throw "'sierra-breeze-enhanced' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
|
||||
signal-desktop-source = throw "'signal-desktop-source' has been renamed to/replaced by 'signal-desktop'"; # Converted to throw 2025-10-27
|
||||
simpleBluez = warnAlias "'simpleBluez' has been renamed to 'simplebluez'" simplebluez; # Added 2026-02-18
|
||||
simpleDBus = warnAlias "'simpleDBus' has been renamed to 'simpledbus'" simpledbus; # Added 2026-02-12
|
||||
simplesamlphp = throw "'simplesamlphp' was removed because it was unmaintained in nixpkgs"; # Added 2025-10-17
|
||||
simpleTpmPk11 = warnAlias "'simpleTpmPk11' has been renamed to 'simple-tpm-pk11'" simple-tpm-pk11; # Added 2026-02-12
|
||||
@@ -2402,6 +2403,7 @@ mapAliases {
|
||||
zigbee2mqtt_2 = zigbee2mqtt; # Added 2025-08-11
|
||||
zinc = throw "'zinc' has been renamed to/replaced by 'zincsearch'"; # Converted to throw 2025-10-27
|
||||
zint = throw "'zint' has been renamed to/replaced by 'zint-qt'"; # Converted to throw 2025-10-27
|
||||
zmkBATx = warnAlias "'zmkBATx' has been renamed to 'zmkbatx'" zmkbatx; # Added 2026-02-18
|
||||
zombietrackergps = throw "'zombietrackergps' has been dropped, as it depends on KDE Gear 5 and is unmaintained"; # Added 2025-08-20
|
||||
zotero_7 = throw "'zotero_7' has been renamed to/replaced by 'zotero'"; # Added 2025-12-09
|
||||
zotify = throw "zotify has been removed due to lack of upstream maintenance"; # Added 2025-09-26
|
||||
|
||||
Reference in New Issue
Block a user