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.

Sign up for GitHub

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

arc-theme: 20210127 -> 20210412, switch to meson #122086

Merged
merged 1 commit into from
May 15, 2021
Merged

arc-theme: 20210127 -> 20210412, switch to meson #122086

merged 1 commit into from
May 15, 2021

Conversation

colemickens
Copy link
Member

@colemickens colemickens commented May 7, 2021 •
edited
Loading

Motivation for this change

It looks like it needs an update for GNOME 40.

doesn't build yet = draft

now it builds, but I haven't tested it yet.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from romildo May 7, 2021 19:42
@timstott
Copy link
Contributor

timstott commented May 8, 2021

Looks like we have duplicated work #122103 (PRs opened 1h apart)

@chvp
Copy link
Member

chvp commented May 9, 2021

Doesn't build currently due to the treewide gnome3 -> gnome rename.

@colemickens
Copy link
Member Author

Doesn't build currently due to the treewide gnome3 -> gnome rename.

do I have to pass gnome manually into call-package now or what? A simple rename wasn't enough to fix this package.

@chvp
Copy link
Member

chvp commented May 10, 2021

The problem seems to be due to the "-unstable-..." suffix in the gnome-shell version. This commit builds for me: chvp@63a2b6a

I haven't tested it yet though.

@chvp
Copy link
Member

chvp commented May 12, 2021

I can confirm that the commit that I linked works for me.

@chvp chvp mentioned this pull request May 13, 2021
Closed
10 tasks
kevincox
kevincox approved these changes May 13, 2021
View reviewed changes
pkgs/data/themes/arc/default.nix Outdated Show resolved Hide resolved
pkgs/data/themes/arc/default.nix

src = fetchFromGitHub {
owner = "jnsh";
repo = pname;
rev = version;
sha256 = "sha256-P7YZTD5bAWNWepL7qsZZAMf8ujzNbHOj/SLx8Fw3bi4=";
sha256 = "sha256-BNJirtBtdWsIzQfsJsZzg1zFbJEzZPq1j2qZ+1QjRH8=";
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
sha256 = "sha256-BNJirtBtdWsIzQfsJsZzg1zFbJEzZPq1j2qZ+1QjRH8=";
hash = "sha256:BNJirtBtdWsIzQfsJsZzg1zFbJEzZPq1j2qZ+1QjRH8=";

I think this is the latest style.

Copy link
Member

Choose a reason for hiding this comment

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

Is there any doc around this?

Copy link
Member

@jtojnar jtojnar May 15, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

The colon is the old Nix style. Dash is the new style, using the https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity format.

Copy link
Member

Choose a reason for hiding this comment

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

And I would not use the hash attribute yet, since fetchgit does not support it.

@kevincox
Copy link
Contributor

I also tested this on nixos-unstable and it worked great. Just needed to s/gnome3/gnome/.

@kevincox
Copy link
Contributor

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

1 package built:
  • arc-theme

@jtojnar jtojnar self-assigned this May 15, 2021
@jtojnar jtojnar marked this pull request as ready for review May 15, 2021 18:22
@jtojnar jtojnar removed their assignment May 15, 2021
@jtojnar jtojnar changed the title wip: arc-theme: 20210127 -> 20210412, switch to meson arc-theme: 20210127 -> 20210412, switch to meson May 15, 2021
@jtojnar jtojnar merged commit 2620ac6 into NixOS:master May 15, 2021
sumnerevans added a commit to sumnerevans/home-manager-config that referenced this pull request Dec 8, 2021
@sumnerevans
theme: temporary fix for arc theme
f6ea112 
Waiting on either of these to be merged:
NixOS/nixpkgs#122086
NixOS/nixpkgs#122103
@colemickens colemickens deleted the arc-theme branch December 30, 2022 01:26
@colemickens colemickens restored the arc-theme branch December 30, 2022 01:27
@colemickens colemickens deleted the arc-theme branch December 30, 2022 01:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar left review comments

@kevincox kevincox kevincox approved these changes

@saschagrunert saschagrunert saschagrunert approved these changes

@romildo romildo Awaiting requested review from romildo

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@colemickens @timstott @chvp @kevincox @saschagrunert @jtojnar