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

gnomeExtensions: auto-update, fix the patches #325257

Merged
merged 3 commits into from
Jul 21, 2024

Conversation

honnip
Copy link
Contributor

@honnip honnip commented Jul 7, 2024

Description of changes

Close #321036
Close #320626
Close #274659, close #267160
Close #325325

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (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.

Add a 👍 reaction to pull requests you find important.

@honnip honnip requested a review from jtojnar as a code owner July 7, 2024 12:56
@github-actions github-actions bot added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Jul 7, 2024
@honnip honnip changed the title Update gnome extensions gnomeExtensions: auto-upate Jul 7, 2024
@honnip honnip changed the title gnomeExtensions: auto-upate gnomeExtensions: auto-update Jul 7, 2024
@Neon-44
Copy link

Neon-44 commented Jul 8, 2024

Hey, this is pretty cool, but the creator of the original Extension said he'd prefer if we didn't package his Extension

Btw: How did you manage to package it? I tried to understand how, but the readme.md isn't exactly a detailed how-to guide

How do I run buildGnomeExtension.nix and how do I "feed the correct arguments into it"?

@Yash-Garg
Copy link
Member

Yash-Garg commented Jul 8, 2024

Hey, this is pretty cool, but the creator of the original Extension said he'd prefer if we didn't package his Extension

Btw: How did you manage to package it? I tried to understand how, but the readme.md isn't exactly a detailed how-to guide

How do I run buildGnomeExtension.nix and how do I "feed the correct arguments into it"?

@Neon-44 The data is being mapped from the extensions.json file below, it builds all the extensions provided a valid json accordingly.

buildShellExtension = callPackage ./buildGnomeExtension.nix { };
# Index of all scraped extensions (with supported versions)
extensionsIndex = lib.importJSON ./extensions.json;
# A list of UUIDs that have the same pname and we need to rename them
extensionRenames = import ./extensionRenames.nix;
# Take all extensions from the index that match the gnome version, build them and put them into a list of derivations
produceExtensionsList = shell-version:
lib.trivial.pipe extensionsIndex [
# Does a given extension match our current shell version?
(builtins.filter
(extension: (builtins.hasAttr shell-version extension."shell_version_map"))
)
# Take in an `extension` object from the JSON and transform it into the correct args to call `buildShellExtension`
(map
(extension: {
inherit (extension) uuid name description link pname;
inherit (extension.shell_version_map.${shell-version}) version sha256 metadata;
})
)
# Build them
(map buildShellExtension)
];

@Neon-44
Copy link

Neon-44 commented Jul 8, 2024

wait, but the readme said that File was generated automatically and I wasn't supposed to touch that?

Whatever, got it. Will do that next time, thanks :)

@honnip honnip changed the title gnomeExtensions: auto-update gnomeExtensions: auto-update, fix the patches Jul 10, 2024
@honnip
Copy link
Contributor Author

honnip commented Jul 10, 2024

wait, but the readme said that File was generated automatically and I wasn't supposed to touch that?

You can run the update-extensions.py to generate extensions.json and collisions.json

@honnip
Copy link
Contributor Author

honnip commented Jul 10, 2024

Result of nixpkgs-review pr 325257 run on x86_64-linux 1

88 packages built:
  • gnomeExtensions.airpod-battery-monitor
  • gnomeExtensions.alternate-menu-for-hplip2
  • gnomeExtensions.autohide-battery
  • gnomeExtensions.battery-health-charging
  • gnomeExtensions.battery-time
  • gnomeExtensions.bluetooth-battery-meter
  • gnomeExtensions.bluetooth-quick-connect
  • gnomeExtensions.bring-out-submenu-of-power-offlogout-button
  • gnomeExtensions.control-monitor-brightness-and-volume-with-ddcutil
  • gnomeExtensions.crazy-internet-speed-meter
  • gnomeExtensions.custom-command-list
  • gnomeExtensions.custom-command-toggle
  • gnomeExtensions.custom-osd
  • gnomeExtensions.day-progress
  • gnomeExtensions.desktop-icons-ng-ding
  • gnomeExtensions.dev-container-manager
  • gnomeExtensions.disconnect-wifi
  • gnomeExtensions.dock-unroll
  • gnomeExtensions.downfall
  • gnomeExtensions.easyeffects-preset-selector
  • gnomeExtensions.emoji-copy
  • gnomeExtensions.focus-follows-workspace
  • gnomeExtensions.forge
  • gnomeExtensions.fuzzy-clock-3
  • gnomeExtensions.fw-fanctrl
  • gnomeExtensions.gamemode-shell-extension
  • gnomeExtensions.github-actions
  • gnomeExtensions.gjs-osk
  • gnomeExtensions.gmeet
  • gnomeExtensions.gnome-hdate
  • gnomeExtensions.gpu-supergfxctl-switch
  • gnomeExtensions.gtk4-desktop-icons-ng-ding
  • gnomeExtensions.happy-appy-hotkey
  • gnomeExtensions.highlight-focus
  • gnomeExtensions.improved-workspace-indicator
  • gnomeExtensions.iso-clock
  • gnomeExtensions.just-perfection
  • gnomeExtensions.language-switch-button
  • gnomeExtensions.lock-keys
  • gnomeExtensions.logo-activities
  • gnomeExtensions.logo-menu
  • gnomeExtensions.lomotion
  • gnomeExtensions.luminus-desktop
  • gnomeExtensions.luminus-shell
  • gnomeExtensions.luminus-shell-y
  • gnomeExtensions.move-to-next-screen
  • gnomeExtensions.mpris-label
  • gnomeExtensions.mythtv
  • gnomeExtensions.network-stats
  • gnomeExtensions.new-workspace-shortcut
  • gnomeExtensions.nordvpn-quick-toggle
  • gnomeExtensions.notifications-alert-on-user-menu
  • gnomeExtensions.open-bar
  • gnomeExtensions.openweather-refined
  • gnomeExtensions.paperwm
  • gnomeExtensions.persian-calendar
  • gnomeExtensions.pin-it
  • gnomeExtensions.ping
  • gnomeExtensions.printers
  • gnomeExtensions.quarter-windows
  • gnomeExtensions.quick-settings-audio-panel
  • gnomeExtensions.ram_sens
  • gnomeExtensions.reading-strip
  • gnomeExtensions.recent-items
  • gnomeExtensions.rectangle
  • gnomeExtensions.respect-do-not-disturb
  • gnomeExtensions.rezmon
  • gnomeExtensions.rounded-window-corners-reborn
  • gnomeExtensions.run-android-emulators
  • gnomeExtensions.server-status-indicator
  • gnomeExtensions.show-desktop-applet
  • gnomeExtensions.signal-shell
  • gnomeExtensions.sticky-notes-integration
  • gnomeExtensions.switch-workspaces-on-active-monitor
  • gnomeExtensions.tiling-shell
  • gnomeExtensions.toggle-headphone
  • gnomeExtensions.top-panel-note
  • gnomeExtensions.tophat
  • gnomeExtensions.touch-x
  • gnomeExtensions.trainfi
  • gnomeExtensions.unmess
  • gnomeExtensions.useless-gaps
  • gnomeExtensions.vertical-workspaces
  • gnomeExtensions.vitals
  • gnomeExtensions.vscode-search-provider
  • gnomeExtensions.wikiart-wallpaper
  • gnomeExtensions.wireless-hid
  • gnomeExtensions.xwayland-indicator

added/updated/removed 18 packages added: gnomeExtensions.disconnect-wifi (init at 33) gnomeExtensions.dock-unroll (init at 4) gnomeExtensions.fuzzy-clock-3 (init at 2) gnomeExtensions.gamemode-shell-extension (init at 10) gnomeExtensions.iso-clock (init at 1) gnomeExtensions.language-switch-button (init at 2) gnomeExtensions.nordvpn-quick-toggle (init at 2) gnomeExtensions.pin-it (init at 12) gnomeExtensions.ram_sens (init at 3) gnomeExtensions.respect-do-not-disturb (init at 3) gnomeExtensions.rounded-window-corners-reborn (init at 2) gnomeExtensions.show-desktop-applet (init at 7) gnomeExtensions.sticky-notes-integration (init at 2) gnomeExtensions.tiling-shell (init at 18) gnomeExtensions.toggle-headphone (init at 3) gnomeExtensions.top-panel-note (init at 2) gnomeExtensions.trainfi (init at 2) gnomeExtensions.wikiart-wallpaper (init at 6)

70 packages updated: gnomeExtensions.airpod-battery-monitor (10 → 14) gnomeExtensions.alternate-menu-for-hplip2 (35 → 36) gnomeExtensions.autohide-battery (51 → 52) gnomeExtensions.battery-health-charging (61 → 63) gnomeExtensions.battery-time (17 → 18) gnomeExtensions.bluetooth-battery-meter (14 → 18) gnomeExtensions.bluetooth-quick-connect (48 → 50) gnomeExtensions.bring-out-submenu-of-power-offlogout-button (54 → 56) gnomeExtensions.control-monitor-brightness-and-volume-with-ddcutil (5 → 7) gnomeExtensions.crazy-internet-speed-meter (10 → 13) gnomeExtensions.custom-command-list (1 → 3) gnomeExtensions.custom-command-toggle (3 → 6) gnomeExtensions.custom-osd (26 → 28) gnomeExtensions.day-progress (9 → 11) gnomeExtensions.desktop-icons-ng-ding (68 → 69) gnomeExtensions.dev-container-manager (23 → 27) gnomeExtensions.downfall (37 → 38) gnomeExtensions.easyeffects-preset-selector (21 → 22) gnomeExtensions.emoji-copy (21 → 23) gnomeExtensions.focus-follows-workspace (9 → 10) gnomeExtensions.forge (80 → 83) gnomeExtensions.fw-fanctrl (4 → 6) gnomeExtensions.github-actions (142 → 146) gnomeExtensions.gjs-osk (10 → 18) gnomeExtensions.gmeet (10 → 13) gnomeExtensions.gnome-hdate (28 → 29) gnomeExtensions.gpu-supergfxctl-switch (3 → 8) gnomeExtensions.gtk4-desktop-icons-ng-ding (79 → 81) gnomeExtensions.happy-appy-hotkey (8 → 9) gnomeExtensions.highlight-focus (11 → 12) gnomeExtensions.improved-workspace-indicator (20 → 23) gnomeExtensions.just-perfection (28 → 29) gnomeExtensions.lock-keys (57 → 58) gnomeExtensions.logo-activities (11 → 16) gnomeExtensions.logo-menu (30 → 32) gnomeExtensions.lomotion (2 → 3) gnomeExtensions.luminus-desktop (7 → 10) gnomeExtensions.luminus-shell (6 → 8) gnomeExtensions.luminus-shell-y (6 → 9) gnomeExtensions.move-to-next-screen (1 → 2) gnomeExtensions.mpris-label (30 → 32) gnomeExtensions.mythtv (16 → 17) gnomeExtensions.network-stats (20 → 24) gnomeExtensions.new-workspace-shortcut (17 → 19) gnomeExtensions.notifications-alert-on-user-menu (50 → 51) gnomeExtensions.open-bar (30 → 36) gnomeExtensions.openweather-refined (14 → 17) gnomeExtensions.paperwm (112 → 118) gnomeExtensions.persian-calendar (112 → 114) gnomeExtensions.ping (3 → 4) gnomeExtensions.printers (25 → 26) gnomeExtensions.quarter-windows (11 → 12) gnomeExtensions.quick-settings-audio-panel (53 → 57) gnomeExtensions.reading-strip (30 → 32) gnomeExtensions.recent-items (27 → 23) gnomeExtensions.rectangle (18 → 21) gnomeExtensions.rezmon (11 → 16) gnomeExtensions.run-android-emulators (2 → 3) gnomeExtensions.server-status-indicator (23 → 26) gnomeExtensions.signal-shell (7 → 10) gnomeExtensions.switch-workspaces-on-active-monitor (15 → 20) gnome-shell-extension-tophat gnomeExtensions.touch-x (7 → 9) gnomeExtensions.unmess (8 → 9) gnomeExtensions.useless-gaps (16 → 17) gnomeExtensions.vertical-workspaces (62 → 65) gnomeExtensions.vitals (67 → 68) gnomeExtensions.vscode-search-provider (7 → 10) gnomeExtensions.wireless-hid (17 → 18) gnomeExtensions.xwayland-indicator (2 → 3)

1 package removed: gnome-shell-extension-admission (†10)

@honnip
Copy link
Contributor Author

honnip commented Jul 19, 2024

updated again

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/4291

@SuperSandro2000 SuperSandro2000 merged commit 4d97790 into NixOS:master Jul 21, 2024
27 checks passed
@honnip honnip deleted the update-gnome-extensions branch July 22, 2024 03:25
msfjarvis added a commit to msfjarvis/nixpkgs that referenced this pull request Jul 29, 2024
…nsions"

This reverts commit 4d97790, reversing
changes made to 4b38234.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants