Skip to content

cosmic-design-demo: init at unstable-2024-01-08#266376

Merged
wegank merged 1 commit intoNixOS:masterfrom
nyabinary:cosmic-design-demo
Jan 12, 2024
Merged

cosmic-design-demo: init at unstable-2024-01-08#266376
wegank merged 1 commit intoNixOS:masterfrom
nyabinary:cosmic-design-demo

Conversation

@nyabinary
Copy link
Copy Markdown
Contributor

@nyabinary nyabinary commented Nov 9, 2023

Description of changes

Design Demo for COSMIC DE

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/)
  • 23.11 Release Notes (or backporting 23.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.

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 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 Nov 9, 2023
@nyabinary nyabinary force-pushed the cosmic-design-demo branch 2 times, most recently from 046d743 to 1914b5e Compare November 10, 2023 01:41
@nyabinary nyabinary mentioned this pull request Nov 10, 2023
Open
33 tasks
nbdd0121
nbdd0121 suggested changes Jan 4, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@nbdd0121 nbdd0121 left a comment

Choose a reason for hiding this comment

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

I got this error when building:

error: The `!include` directive has been stabilized as `import`

The error is added in Just 1.18 (released 2023-12-24).

@nyabinary
Copy link
Copy Markdown
Contributor Author

nyabinary commented Jan 4, 2024

I got this error when building:

error: The `!include` directive has been stabilized as `import`

The error is added in Just 1.18 (released 2023-12-24).

I believe this is an error on COSMIC side?

@nbdd0121
Copy link
Copy Markdown
Member

nbdd0121 commented Jan 4, 2024

It was an unstable feature that cosmic-design-demo used, but the feature was stablised in just 1.17 and unstable version removed in just 1.18. cosmic-design-demo's justfile hasn't been updated in the meanwhile.

@nyabinary
Copy link
Copy Markdown
Contributor Author

nyabinary commented Jan 4, 2024

It was an unstable feature that cosmic-design-demo used, but the feature was stablised in just 1.17 and unstable version removed in just 1.18. cosmic-design-demo's justfile hasn't been updated in the meanwhile.

i wonder if we can do a sed and replace that line for now?

@nbdd0121
Copy link
Copy Markdown
Member

nbdd0121 commented Jan 5, 2024

I just tested it, but unfortunately that's not sufficient. import is different from !include in terms of working directory -- the former uses the directory that contains the included file, and the later uses that of the including file.

@nyabinary
Copy link
Copy Markdown
Contributor Author

nyabinary commented Jan 5, 2024

I just tested it, but unfortunately that's not sufficient. import is different from !include in terms of working directory -- the former uses the directory that contains the included file, and the later uses that of the including file.

Maybe opening a PR for cosmic-design-demo and updating the justfile is the best option then.

@nyabinary nyabinary changed the title cosmic-design-demo: init at unstable-2023-10-24 cosmic-design-demo: init at unstable-2024-01-08 Jan 9, 2024
@nyabinary
Copy link
Copy Markdown
Contributor Author

nyabinary commented Jan 9, 2024

I just tested it, but unfortunately that's not sufficient. import is different from !include in terms of working directory -- the former uses the directory that contains the included file, and the later uses that of the including file.

Been fixed now :)

@wegank wegank merged commit 3d0fb3a into NixOS:master Jan 12, 2024
@nyabinary nyabinary deleted the cosmic-design-demo branch January 14, 2024 15:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

+1 more reviewer

@nbdd0121 nbdd0121 nbdd0121 requested changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

8.has: package (new) This PR adds a new package 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. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@nyabinary @nbdd0121 @SuperSandro2000 @wegank