Skip to content

Conversation

dtomvan
Copy link
Contributor

@dtomvan dtomvan commented Jun 11, 2025

Fixes #415342.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@dtomvan dtomvan mentioned this pull request Jun 12, 2025
13 tasks
@dtomvan dtomvan force-pushed the bazaar branch 3 times, most recently from 537bc53 to 21d19f9 Compare June 20, 2025 14:41
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jun 20, 2025
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` and removed 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jun 21, 2025
@dtomvan dtomvan force-pushed the bazaar branch 2 times, most recently from fbdedbd to cf06225 Compare June 24, 2025 21:42
@dtomvan dtomvan changed the title bazaar: init at 0-unstable-2025-06-11 {,nixos/}bazaar: init at 0-unstable-2025-06-24 Jun 24, 2025
@dtomvan
Copy link
Contributor Author

dtomvan commented Jun 24, 2025

Functional again as of now if services.gvfs.enable = true; is set. gvfs is not required anymore.

Not ready yet because still alpha software.

@dtomvan dtomvan changed the title {,nixos/}bazaar: init at 0-unstable-2025-06-24 bazaar: init at 0.1.0 Jun 25, 2025
@dtomvan
Copy link
Contributor Author

dtomvan commented Jun 25, 2025

Worked with the dev a bit to iron out some issues that seemed nixos-specific, and they released 0.1.0. I'll open it for review so this can get some eyes onto it. It still contains a couple hacks though.

@dtomvan dtomvan marked this pull request as ready for review June 25, 2025 17:07
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. and removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jun 25, 2025
@normalcea
Copy link
Contributor

Some initial nits:

  • Use tag over rev since we now have tagged releases
  • nativeBuildInputs should go before buildInputs
diff --git a/pkgs/by-name/ba/bazaar/package.nix b/pkgs/by-name/ba/bazaar/package.nix
index c9d0c11bc8b7..dae59029c219 100644
--- a/pkgs/by-name/ba/bazaar/package.nix
+++ b/pkgs/by-name/ba/bazaar/package.nix
@@ -64,10 +64,18 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kolunmi";
     repo = "bazaar";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-QzzWj6KjyKNMBHQ/RqvUSL6QeokgvK2Fc+23kkt3SMM=";
   };
 
+  nativeBuildInputs = [
+    desktop-file-utils
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+  ];
+
   buildInputs = [
     appstream
     flatpak
@@ -88,14 +96,6 @@ stdenv.mkDerivation (finalAttrs: {
     libyaml
   ];
 
-  nativeBuildInputs = [
-    desktop-file-utils
-    meson
-    ninja
-    pkg-config
-    wrapGAppsHook4
-  ];
-
   mesonFlags = [
     (lib.mesonOption "hardcoded_content_config_path" "${finalAttrs.passthru.configFile}")
   ];

@nixpkgs-ci nixpkgs-ci bot added the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Jul 4, 2025
@dtomvan dtomvan changed the title bazaar: init at 0.1.0 bazaar: init at 0.2.0 Jul 7, 2025
@normalcea
Copy link
Contributor

normalcea commented Jul 10, 2025

Is the patch we have currently able to be upstreamed/fixed in Bazaar proper or is it a Nix specific thing that wouldn't make sense to do so?

never mind the patch is for libglycin

@dtomvan dtomvan changed the title bazaar: init at 0.2.2 bazaar: init at 0.2.3 Jul 15, 2025
@normalcea
Copy link
Contributor

normalcea commented Jul 15, 2025

and show a placeholder like "there's nothing here" in the curated section.

From a design perspective it should either be absent/not visible (ideal) or they would be a specific message saying that there is no configuration/curation provided (less ideal).

Re: my comment about branding: I don't have an idea of what Nix branding might look like since NixOS is a general purpose DIY distribution. There could maybe exist a general purpose configuration upstream that can just be used if the distribution doesn't wish to curate anything specific because it looks like the config takes hardcoded flatpak refs instead of being sorted by tags.

I remember seeing mockups for a trending page in the GNOME design matrix but I don't see that there from your screenshot.

@dtomvan
Copy link
Contributor Author

dtomvan commented Jul 16, 2025

To be perfectly clear, this is what the "curated" page looks like when no config is set:

image

The wording seems to imply that this is not how it should be and unexpected by bazaar. I have no idea how to resolve this, because I don't think it's a good idea to just "put something there" because it might not be relevant at all to our users. This model only really works for the uBlue folks, because they are all about that curated/omakase experience.

@normalcea
Copy link
Contributor

I've drafted a upstream issue for this to see what approach we should take.

@dtomvan dtomvan changed the title bazaar: init at 0.2.3 bazaar: init at 0.3.0 Aug 12, 2025
@dtomvan
Copy link
Contributor Author

dtomvan commented Aug 12, 2025

Had to update libdex also. PR search is broken for me right now, so for testing purposes in the same PR.

@normalcea
Copy link
Contributor

suggestion: remove libdex commit

The libdex version bump no longer needs to be included, most apps aren't using this new of a libdex version as it isn't in the GNOME 48 SDK kolunmi/bazaar@2e243a5

thought: Curated section issue resolved

This issue was resolved in kolunmi/bazaar@f19feae so we don't have to worry about a default configuration in the next major version.

@dtomvan
Copy link
Contributor Author

dtomvan commented Aug 17, 2025

Alright I think I can do that if I up the package to 0.3.1.

@dtomvan
Copy link
Contributor Author

dtomvan commented Aug 17, 2025

Nope, I still get Dependency libdex-1 found: NO. Found 0.10.1 but need: '>= 0.11.1'.

@dtomvan dtomvan changed the title bazaar: init at 0.3.0 bazaar: init at 0.3.1 Aug 17, 2025
@normalcea
Copy link
Contributor

That change seems to have been reverted in https://github.com/kolunmi/bazaar/commits/a7504afb8fbe960577346e9ea55b5bed227003b7

@dtomvan
Copy link
Contributor Author

dtomvan commented Aug 20, 2025

I guess we're waiting for an upstream change like kolunmi/bazaar#214 ? Or do I just override the src and version for libdex in pkgs/by-name/ba/bazaar/package.nix?

@dtomvan
Copy link
Contributor Author

dtomvan commented Aug 24, 2025

Image loading still broken......

@dtomvan dtomvan changed the title bazaar: init at 0.3.1 bazaar: init at 0.4.0 Aug 24, 2025
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. and removed 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Aug 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Package Request: Bazaar - A new flathub first app store for GNOME
2 participants