From aaf3d2439ff3088a73e7e785185efbe86809256d Mon Sep 17 00:00:00 2001 From: Albert Cervin Date: Thu, 12 Sep 2024 20:53:53 +0200 Subject: [PATCH] Upgrade nixpkgs to 24.05 --- flake.lock | 8 ++++---- flake.nix | 2 +- src/dged/minibuffer.c | 4 +--- src/dged/window.c | 12 +++--------- src/main/completion.c | 8 ++------ 5 files changed, 11 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 4a5def3..628df20 100644 --- a/flake.lock +++ b/flake.lock @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719122173, - "narHash": "sha256-aEMsNUtqSPwn6l+LIZ/rX++nCgun3E9M3uSZs6Rwb7w=", + "lastModified": 1725930920, + "narHash": "sha256-RVhD9hnlTT2nJzPHlAqrWqCkA7T6CYrP41IoVRkciZM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "906320ae02f769d13a646eb3605a9821df0d6ea2", + "rev": "44a71ff39c182edaf25a7ace5c9454e7cba2c658", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index 522b24d..4205644 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "An editor for datagubbar"; - inputs.nixpkgs.url = "nixpkgs/nixos-23.11"; + inputs.nixpkgs.url = "nixpkgs/nixos-24.05"; inputs.flake-utils.url = "github:numtide/flake-utils"; outputs = { self, nixpkgs, flake-utils }: diff --git a/src/dged/minibuffer.c b/src/dged/minibuffer.c index c16a9bf..c74a900 100644 --- a/src/dged/minibuffer.c +++ b/src/dged/minibuffer.c @@ -153,9 +153,7 @@ struct text_chunk minibuffer_content(void) { return buffer_line(g_minibuffer.buffer, 0); } -struct buffer *minibuffer_buffer(void) { - return g_minibuffer.buffer; -} +struct buffer *minibuffer_buffer(void) { return g_minibuffer.buffer; } void minibuffer_echo(const char *fmt, ...) { va_list args; diff --git a/src/dged/window.c b/src/dged/window.c index 702f97a..93a5c48 100644 --- a/src/dged/window.c +++ b/src/dged/window.c @@ -134,13 +134,9 @@ struct window *root_window(void) { return &BINTREE_VALUE(BINTREE_ROOT(&g_windows.windows)); } -struct window *minibuffer_window(void) { - return &g_minibuffer_window; -} +struct window *minibuffer_window(void) { return &g_minibuffer_window; } -struct window *popup_window(void) { - return &g_popup_window; -} +struct window *popup_window(void) { return &g_popup_window; } bool popup_window_visible(void) { return g_popup_visible; } @@ -412,9 +408,7 @@ struct window *window_find_by_buffer(struct buffer *b) { return NULL; } -struct window *windows_get_active(void) { - return g_windows.active; -} +struct window *windows_get_active(void) { return g_windows.active; } void window_set_buffer(struct window *window, struct buffer *buffer) { window_set_buffer_e(window, buffer, true, true); diff --git a/src/main/completion.c b/src/main/completion.c index 7a002ac..38d75ab 100644 --- a/src/main/completion.c +++ b/src/main/completion.c @@ -67,13 +67,9 @@ static struct completion_provider g_commands_provider = { .userdata = NULL, }; -struct completion_provider path_provider(void) { - return g_path_provider; -} +struct completion_provider path_provider(void) { return g_path_provider; } -struct completion_provider buffer_provider(void) { - return g_buffer_provider; -} +struct completion_provider buffer_provider(void) { return g_buffer_provider; } struct completion_provider commands_provider(void) { return g_commands_provider;