From e936642bc41d27f0f788b020713dc8707ef0a282 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 8 Sep 2024 19:56:48 +0300 Subject: [PATCH 1/4] nix: update nixpkgs input --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b62ff7af..64115251 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1718714799, - "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { From fa6b26821d87133018e948c53dcd7387072008f5 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 8 Sep 2024 19:59:02 +0300 Subject: [PATCH 2/4] nix: make source path reproducible --- nix/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nix/default.nix b/nix/default.nix index fbb1e59a..e853d7c3 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -41,7 +41,11 @@ in src = buildNpmPackage { name = pname; - src = lib.cleanSource ../.; + + src = builtins.path { + name = "ags-${version}"; + path = lib.cleanSource ../.; + }; dontBuild = true; From 9d31d76f72458b16f93e87522aff0644ad78f1f6 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 8 Sep 2024 19:59:49 +0300 Subject: [PATCH 3/4] nix: use top-level gnome-bluetooth Fixes a minor eval warning with recent Nixpkgs versions... --- nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index e853d7c3..6582071c 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -13,7 +13,7 @@ gjs, wrapGAppsHook, upower, - gnome, + gnome-bluetooth, gtk-layer-shell, glib-networking, networkmanager, @@ -74,7 +74,7 @@ in gtk3 libpulseaudio upower - gnome.gnome-bluetooth + gnome-bluetooth gtk-layer-shell glib-networking networkmanager From 7c900070d145c211694b8e949048987b936a9940 Mon Sep 17 00:00:00 2001 From: Isabelroses <> Date: Sun, 8 Sep 2024 20:02:06 +0300 Subject: [PATCH 4/4] nix: fix maintainers field; add mainProgram --- nix/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nix/default.nix b/nix/default.nix index 6582071c..3f9279be 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -108,6 +108,7 @@ in changelog = "https://github.com/Aylur/ags/blob/${version}/CHANGELOG.md"; platforms = ["x86_64-linux" "aarch64-linux"]; license = lib.licenses.gpl3; - meta.maintainers = [lib.maintainers.Aylur]; + mainProgram = "ags"; + maintainers = [lib.maintainers.Aylur]; }; }