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

Jump to bottom

gnome.gnome-desktop: make deterministic #151356

Merged
merged 2 commits into from Dec 19, 2021
Merged

gnome.gnome-desktop: make deterministic #151356

merged 2 commits into from Dec 19, 2021

Conversation

Artturin
Copy link
Member

@Artturin Artturin commented Dec 19, 2021 •
edited

makes it so the date wont be added to gnome-version.xml
<date>2021-12-18</date>

Motivation for this change

https://r13y.com/iso_gnome/diff/812e597aa95cff2b09d1fe5eb25bd681b699e8603cc4927b39cd8b656d3626e4-db893410d32a3c5e1d9d3bcbc2876fe3cecbde88c1dc675e4e8d7b8ac75be826.html

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.05 Release Notes (or backporting 21.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@Artturin
gnome.gnome-desktop: make deterministic
f58b14b 
makes it so the date wont be added to gnome-version.xml
<date>2021-12-18</date>
@github-actions github-actions bot added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Dec 19, 2021
@Artturin
gnome.gnome-desktop: set gnome_distributor
acb6265 
arch sets this to "Arch Linux"
openSUSE to "openSUSE"
@Artturin
Copy link
Member Author

Artturin commented Dec 19, 2021 •
edited

i also set the gnome_distributor in this pr as its a simple&safe change

-  <distributor>GNOME.Org</distributor>
-  <date>2021-11-23</date>
+  <distributor>NixOS</distributor>
+  <!--<date></date>-->

Mindavi
Mindavi approved these changes Dec 19, 2021
View reviewed changes
Copy link
Contributor

@Mindavi Mindavi left a comment

Choose a reason for hiding this comment

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

Diff LGTM

@ofborg ofborg bot requested review from dasj19 and maxeaubrey December 19, 2021 19:20
@jtojnar jtojnar merged commit 56cd070 into NixOS:master Dec 19, 2021
27 checks passed
@jtojnar
Copy link
Contributor

jtojnar commented Dec 19, 2021

Thanks.

@Artturin Artturin deleted the gnomedesktop-determistic branch December 19, 2021 19:38
Atemu
Atemu reviewed Dec 20, 2021
View reviewed changes
pkgs/desktops/gnome/core/gnome-desktop/default.nix
@@ -75,6 +75,8 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dgtk_doc=true"
"-Ddesktop_docs=false"
"-Ddate_in_gnome_version=false"
Copy link
Member

Choose a reason for hiding this comment

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

Nit: Is it possible to set the date somehow? I'd prefer if it embedded SOURCE_DATE_EPOCH.

Copy link
Member Author

@Artturin Artturin Dec 20, 2021 •
edited

Choose a reason for hiding this comment

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

there is no option for that https://gitlab.gnome.org/GNOME/gnome-desktop/-/blob/master/meson_options.txt

i do not think it is worth the effort to manually sed it

pkgs/desktops/gnome/core/gnome-desktop/default.nix
@@ -75,6 +75,8 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dgtk_doc=true"
"-Ddesktop_docs=false"
"-Ddate_in_gnome_version=false"
"-Dgnome_distributor=NixOS"
Copy link
Member

Choose a reason for hiding this comment

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

Does this option apply to other packages too?

Copy link
Member Author

Choose a reason for hiding this comment

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

grepping through the openSUSE packages only gnome-desktop has it https://github.com/bmwiedemann/openSUSE

Copy link
Contributor

Choose a reason for hiding this comment

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

This is used for XML file serving as a data source to About panel of GNOME Control Center, displaying info about system. That is only relevant for gnome-desktop which contains the file.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Atemu Atemu Atemu left review comments

@Mindavi Mindavi Mindavi approved these changes

@hedning hedning

@jtojnar jtojnar

@dasj19 dasj19

@maxeaubrey maxeaubrey

Assignees
No one assigned
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: reproducible builds 10.rebuild-darwin: 1-10 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Artturin @jtojnar @Mindavi @Atemu