Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gnome: rename deprecated pkgs.gnome.gnome-backgrounds package #531

Conversation

trueNAHO
Copy link
Collaborator

@trueNAHO trueNAHO commented Aug 26, 2024

Rename the deprecated pkgs.gnome.gnome-backgrounds package to pkgs.gnome-backgrounds, following NixOS/nixpkgs@6e8760f.

Cc: @knoopx

Rename the deprecated pkgs.gnome.gnome-backgrounds option to
pkgs.gnome-backgrounds, following [1].

[1]: NixOS/nixpkgs@6e8760f

Closes: danth#528
Link: danth#529

Co-authored-by: Victor Martinez <[email protected]>
@trueNAHO trueNAHO marked this pull request as ready for review August 26, 2024 17:18
@danth danth changed the title gnome: rename deprecated pkgs.gnome.gnome-backgrounds option gnome: rename deprecated pkgs.gnome.gnome-backgrounds package Aug 26, 2024
Copy link
Owner

@danth danth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@danth danth merged commit 6c895c6 into danth:master Aug 26, 2024
10 checks passed
@matteocavestri
Copy link

This merge broke compatibility with GNOME for Nixpkgs 24.05.
Therefore, it is necessary to set the following if using the nixosmodule:
stylix.targets.gnome.enable = false;

However, the module for Home Manager works.

The error is that in Nixpkgs 24.05, gnome-background does not exist, but the old package gnome.gnome-background does.

This could fix the problem:

( if (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") then gnome.gnome-background else gnome-background )

@trueNAHO
Copy link
Collaborator Author

trueNAHO commented Sep 2, 2024

This merge broke compatibility with GNOME for Nixpkgs 24.05. [...] The error is that in Nixpkgs 24.05, gnome-background does not exist, but the old package gnome.gnome-background does.

Forgive my inexperience regarding version compatibility, but is this only a problem when Stylix and Nixpkgs are not both following nixos-24.05:

inputs.stylix.inputs.nixpkgs.follows = "github:nixos/nixpkgs/nixos-24.05";

I assmumed the following would properly update inputs:

diff --git a/flake.lock b/flake.lock
index 25b73e76..10a0dcf0 100644
--- a/flake.lock
+++ b/flake.lock
[...]
@@ -205,11 +205,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1714912032,
-        "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
+        "lastModified": 1723415338,
+        "narHash": "sha256-K/BVeDLkpswRSBh3APxc2gBNVFEMXGpnkuQz666FiTM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d",
+        "rev": "6e8760f7f7121128e2037db44915a4a5450b6e67",
         "type": "github"
       },
       "original": {

This could fix the problem:

( if (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") then gnome.gnome-background else gnome-background )

If this is a Stylix problem, we could backport this to the https://github.com/danth/stylix/tree/release-24.05 branch.

@danth
Copy link
Owner

danth commented Sep 2, 2024

The master branch of Stylix should be compatible with nixos-unstable / nixpkgs-unstable, and the nixos-24.05 branches should be compatible with each other. This means we can avoid using conditionals such as the suggested fix above.

@matteocavestri
Copy link

Thanks, my bad

mateusauler pushed a commit to mateusauler/stylix that referenced this pull request Nov 17, 2024
…h#531)

Rename the deprecated `pkgs.gnome.gnome-backgrounds` package to
`pkgs.gnome-backgrounds`, following
NixOS/nixpkgs@6e8760f.

Cc: @knoopx

Co-authored-by: Victor Martinez <[email protected]>
mateusauler pushed a commit to mateusauler/stylix that referenced this pull request Nov 20, 2024
…h#531)

Rename the deprecated `pkgs.gnome.gnome-backgrounds` package to
`pkgs.gnome-backgrounds`, following
NixOS/nixpkgs@6e8760f.

Cc: @knoopx

Co-authored-by: Victor Martinez <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants