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

fish: Use /bin/hostname on darwin. Fixes #11012. #11691

Merged
merged 1 commit into from
Dec 14, 2015

Conversation

projedi
Copy link
Contributor

@projedi projedi commented Dec 13, 2015

nettools are unavailable for Darwin and I don't know of the alternatives. So falling back to using hostname from the environment (as it was prior to #10841).

If there's a nix package with hostname for Darwin, please let me know, I'll fix this PR to use it instead.

@mention-bot
Copy link

By analyzing the blame information on this pull request, we identified @samuelrivas, @bjornfor and @ocharles to be potential reviewers

@pSub pSub added the 6.topic: darwin Running or building packages on Darwin label Dec 14, 2015
@ocharles
Copy link
Contributor

I don't have any real thoughts on this - it looks like it makes fish work with darwin and behaviour stays the same under non-darwin environments. 👍 from me.

ocharles added a commit that referenced this pull request Dec 14, 2015
fish: Use /bin/hostname on darwin. Fixes #11012.
@ocharles ocharles merged commit 30a99f3 into NixOS:master Dec 14, 2015
@copumpkin
Copy link
Member

It comes from the shell_cmds project, which I don't think has been packaged yet. Probably wouldn't be much work to do that, but this should be fine for now.

cc @pikajude

@projedi
Copy link
Contributor Author

projedi commented Dec 14, 2015

Ok, cool! Thanks!

@projedi projedi deleted the fish-darwin-hostname-fix branch December 14, 2015 16:02
@emhamm emhamm mentioned this pull request Jan 19, 2023
13 tasks
emhamm added a commit to emhamm/nixpkgs that referenced this pull request Jan 20, 2023
prometheus 2.40.x is out of support since 12/2022 therefore the update to 2.41.0

between those two releases security critical patches have been added both to
prometheus codebase and upstream dependecies, see:
  * 2.40.6 / 2022-12-09
    prometheus/prometheus#11690
      [SECURITY] Security upgrade from go and upstream dependencies that include
      security fixes to the net/http and os packages. NixOS#11691

  *  2.40.4 / 2022-11-29
    GHSA-7rg2-cxvp-9p7p
    GHSA-4v48-4q5m-8vx4
      [SECURITY] Fix basic authentication bypass vulnerability
      (CVE-2022-46146) GHSA-4v48-4q5m-8vx4
github-actions bot pushed a commit that referenced this pull request Jan 23, 2023
prometheus 2.40.x is out of support since 12/2022 therefore the update to 2.41.0

between those two releases security critical patches have been added both to
prometheus codebase and upstream dependecies, see:
  * 2.40.6 / 2022-12-09
    prometheus/prometheus#11690
      [SECURITY] Security upgrade from go and upstream dependencies that include
      security fixes to the net/http and os packages. #11691

  *  2.40.4 / 2022-11-29
    GHSA-7rg2-cxvp-9p7p
    GHSA-4v48-4q5m-8vx4
      [SECURITY] Fix basic authentication bypass vulnerability
      (CVE-2022-46146) GHSA-4v48-4q5m-8vx4

(cherry picked from commit bfac961)
@Janik-Haag Janik-Haag added the 12. first-time contribution This PR is the author's first one; please be gentle! label Jun 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants