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

Missing runtime dependencies for gitwatch #374317

Closed
wants to merge 4,858 commits into from
Closed

Conversation

roomcays
Copy link
Contributor

As I have described on discourse thread:

  1. I have installed this packages system-wide on NixOS stable 24.11
  2. when using gitwatch program from interactive shell it worked fine
  3. I have then tried to put in under control of user-spaced systemd service unit to make it start automatically; this however could not happen due to errors:
Dec 31 22:34:50 hosthost gitwatch[3688627]: /nix/store/vabiazsm1vk3mcjhfx7cq31p211icx7s-gitwatch/bin/.gitwatch-wrapped: line 225: sed: command not found
Dec 31 22:34:50 hosthost gitwatch[3688629]: /nix/store/vabiazsm1vk3mcjhfx7cq31p211icx7s-gitwatch/bin/.gitwatch-wrapped: line 273: grep: command not found

Things done

I have added gnused, gnugrep and coreutils to the package.nix script.

  • Built on platform(s)

    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested using nixos-rebuild switch

bobby285271 and others added 30 commits January 10, 2025 22:39
(cherry picked from commit 97c7858)
The previous Darwin breakage due to p9mbtowc also happens on Linux now.

(cherry picked from commit ed59c74)
(cherry picked from commit d170722)
(cherry picked from commit 4b6cae3)
When updating a toolchain (rustup update stable) the previously
created wrapped ld.lld causes the new setup to fail.  This is
not ideal as it either is a spurious error, or it indicates
that the update has failed when it shouldn't have.

By using create_dir_all instead of create_dir, we avoid this problem.

Signed-off-by: Daniel Silverstone <[email protected]>
(cherry picked from commit 375f840)
(cherry picked from commit f5bd23e)
(cherry picked from commit a6e3802)
Additionally, no permissions are needed so set it to an empty set
Signed-off-by: John Titor <[email protected]>
(cherry picked from commit 3ff50a2)
Lock the Ubuntu runner to ubuntu-22.04 to avoid accidental updates [1]
and increase reproducibility.

[1]: actions/runner-images#10636

(cherry picked from commit 2660dd1)
….1 (NixOS#371397)

Bumps [actions/create-github-app-token](https://github.com/actions/create-github-app-token) from 1.11.0 to 1.11.1.
- [Release notes](https://github.com/actions/create-github-app-token/releases)
- [Commits](actions/create-github-app-token@v1.11.0...c1a2851)

---
updated-dependencies:
- dependency-name: actions/create-github-app-token
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
(cherry picked from commit ebdb307)
@github-actions github-actions bot added 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: emacs Text editor 6.topic: printing 6.topic: rust 6.topic: policy discussion 6.topic: vim 6.topic: hardware 6.topic: pantheon The Pantheon desktop environment 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: testing Tooling for automated testing of packages and modules 6.topic: module system About "NixOS" module system internals 6.topic: jitsi 6.topic: java Including JDK, tooling, other languages, other VMs 6.topic: Lumina DE The Lumina Desktop Environment 6.topic: Enlightenment DE The Enlightenment Desktop Environment 6.topic: mate The MATE Desktop Environment 6.topic: flakes The experimental Nix feature 6.topic: lib The Nixpkgs function library 6.topic: jupyter Interactive computing tooling: kernels, notebook, jupyterlab 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 6.topic: deepin Desktop environment and its components 6.topic: dotnet Language: .NET 6.topic: nvidia 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions labels Jan 16, 2025
@Shawn8901
Copy link
Contributor

Shawn8901 commented Jan 16, 2025

Seems that there is an opti in your branches, quite sure we don't want to merge a master to release branch

What to do was kinda described already here: #374287 (comment)

Normally you want to fix it first on unstable (so in that case master) and then back port if reasonable (which is done by a label assignment and then a bit does magic)

@roomcays
Copy link
Contributor Author

Thanks for the comment with explanations. I didn't know how to do it right because basing on master flood me with GitHub CI/CD complaints.

I will now:

  1. close this PR
  2. put my fix on forked master branch
  3. open new PR

I hope this will finally be what I'm supposed to do.

@roomcays roomcays closed this Jan 16, 2025
@roomcays
Copy link
Contributor Author

One more thing: after my initial PR (few hours ago) I have received a message from GitHub suggesting that maybe I should edit my PR and change the base (https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-base-branch-of-a-pull-request). This suggestion led me to the idea of branching out from release-24.11.

I suppose this message was internal GitHub and not coming from this repository workflow?

@Shawn8901
Copy link
Contributor

Shawn8901 commented Jan 16, 2025

I am not sure what you are doing tbh, I would do the following on your side

  1. Update the fork to be a synced master (not having any changes)
  2. git switch -c update-gitwatch-dependencies
  3. Apply your changes
  4. Do a commit thats message applies to the contribution guidelines (something like gitwatch: add gnuset, gnugrep and coreutils as runtimeDependencies )
  5. Push the branch
  6. Purpose a Merge from your branch to master
  7. Add the label "backport release-24.11" on the PR

That should result on a okay'ish PR

@roomcays
Copy link
Contributor Author

Thank you @Shawn8901 I will keep your suggestion as a reminder for the future. My new PR have been accepted (thankfully), even with invalid commit message.

What I'm doing? Well... learning on mistakes, I suppose ;-) Learning how to contribute, collaborate and use GitHub.
So thumbs up for you guys for explaining and being patient.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 6.topic: deepin Desktop environment and its components 6.topic: dotnet Language: .NET 6.topic: emacs Text editor 6.topic: Enlightenment DE The Enlightenment Desktop Environment 6.topic: flakes The experimental Nix feature 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: hardware 6.topic: haskell 6.topic: java Including JDK, tooling, other languages, other VMs 6.topic: jitsi 6.topic: jupyter Interactive computing tooling: kernels, notebook, jupyterlab 6.topic: lib The Nixpkgs function library 6.topic: Lumina DE The Lumina Desktop Environment 6.topic: mate The MATE Desktop Environment 6.topic: module system About "NixOS" module system internals 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: nvidia 6.topic: pantheon The Pantheon desktop environment 6.topic: policy discussion 6.topic: printing 6.topic: python 6.topic: rust 6.topic: testing Tooling for automated testing of packages and modules 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: vim 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 8.has: module (update) This PR changes an existing module in `nixos/`
Projects
None yet
Development

Successfully merging this pull request may close these issues.