nixos/xmonad: rename NIX_GHC env var to XMONAD_GHC#184784
Merged
sternenseemann merged 2 commits intoNixOS:masterfrom Aug 4, 2022
Merged
nixos/xmonad: rename NIX_GHC env var to XMONAD_GHC#184784sternenseemann merged 2 commits intoNixOS:masterfrom
sternenseemann merged 2 commits intoNixOS:masterfrom
Conversation
Upstream XMonad was using our xmonad patch file for their flake build to support our nixos module. This would of course break the build upstream if the version we patched and their master branch diverged. We [discussed] that it'd make sense to upstream the environment var code. In the process it seemed sensible to rename the NIX_GHC variable as well, since it isn't really Nix-specific – it's just a way to set the GHC binary to execute. This change has been [implemented] upstream in an unreleased version of xmonad now – meaning we'll be able to drop the xmonad patch soon! This also clarifies the situation in nixpkgs a bit: NIX_GHC is easy to confuse with the environment variable used in the ghcWithPackages wrapper where it is used to set an alternative prefix for a GHC-wrapper for applications trying to discover it via e.g. ghc-paths. It is an implementation detail in this context, as it is in the case of the xmonad module. Since they are different implementations doing different things, different names also make sense. [discussed]: NixOS@36d5761 [implemented]: xmonad/xmonad@23f36d7
Member
Author
|
@ofborg test xmonad |
github-actions
bot
added
6.topic: haskell
4 tasks
ofborg
bot
added
10.rebuild-darwin: 1-10
bjornfor
approved these changes
Aug 2, 2022
Member
Author
|
@ofborg test xmonad |
bobby285271
added
the
12.approvals: 2
13 tasks
sternenseemann
added a commit
to sternenseemann/nixpkgs
that referenced
this pull request
Sep 14, 2022
We had a long standing downstream patch for XMonad allowing us to override the ghc and xmessage binaries used. That has been upstreamed and released in 0.17.1 and we can drop it! * patch upstreamed in xmonad/xmonad#409 * downstream patch adjusted in NixOS#184784
sternenseemann
added a commit
that referenced
this pull request
Sep 14, 2022
We had a long standing downstream patch for XMonad allowing us to override the ghc and xmessage binaries used. That has been upstreamed and released in 0.17.1 and we can drop it! * patch upstreamed in xmonad/xmonad#409 * downstream patch adjusted in #184784
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Upstream XMonad was using our xmonad patch file for their flake build to
support our nixos module. This would of course break the build upstream
if the version we patched and their master branch diverged. We
discussed that it'd make sense to upstream the environment var code.
In the process it seemed sensible to rename the NIX_GHC variable as
well, since it isn't really Nix-specific – it's just a way to set the
GHC binary to execute. This change has been implemented upstream in an
unreleased version of xmonad now – meaning we'll be able to drop the
xmonad patch soon!
This also clarifies the situation in nixpkgs a bit: NIX_GHC is easy to
confuse with the environment variable used in the ghcWithPackages
wrapper where it is used to set an alternative prefix for a GHC-wrapper
for applications trying to discover it via e.g. ghc-paths. It is an
implementation detail in this context, as it is in the case of the
xmonad module. Since they are different implementations doing different
things, different names also make sense.
Description of changes
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes