diff options
-rw-r--r-- | lib/systems/inspect.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/klipper/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/ockam/default.nix | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 073df78797c7..5e5e92699e44 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -98,6 +98,9 @@ rec { { cpu = { family = "riscv"; }; } { cpu = { family = "x86"; }; } ]; + + isElf = { kernel.execFormat = execFormats.elf; }; + isMacho = { kernel.execFormat = execFormats.macho; }; }; # given two patterns, return a pattern which is their logical AND. diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 4726c63e1448..341fc484451f 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2023-12-13"; + version = "unstable-2024-01-06"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "f0753bd3381a86826082d5bf7a349c1f0b9f7e48"; - sha256 = "sha256-4xaee/7tXmR4/249lxHocana0KoesdH22/7HXWq1xwk="; + rev = "b50d6669a8b491edf07602c0528d26abe8985536"; + sha256 = "sha256-qI+0bia5ROzXcuz0JVLdGyRa45NWTU/MH8dBUXGaHgA="; }; sourceRoot = "${src.name}/klippy"; diff --git a/pkgs/tools/networking/ockam/default.nix b/pkgs/tools/networking/ockam/default.nix index 8b8d8dd60eca..472dec1b83dd 100644 --- a/pkgs/tools/networking/ockam/default.nix +++ b/pkgs/tools/networking/ockam/default.nix @@ -12,7 +12,7 @@ let pname = "ockam"; - version = "0.114.0"; + version = "0.115.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage { owner = "build-trust"; repo = pname; rev = "ockam_v${version}"; - sha256 = "sha256-oR5SzLPJ4I87bMyHTwd+Vjm7pR+modBGIEqls9s6hVI="; + sha256 = "sha256-DPRMPGxOuF4FwDXyVNxv9j2qy3K1p/9AVmrp0pPUQXM="; }; - cargoHash = "sha256-m86NT3O1PbTWxc0Q5pqkLECHHKtF4w8Vl5eDpvxjDHs="; + cargoHash = "sha256-SeBv2yO0E60C4xMGf/7LOOyTOXf8vZCxIBC1dU2CAX0="; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.isDarwin [ Security ]; |