release 21.11 backport gen linux fix#3387
Closed
blaggacao wants to merge 24 commits intonix-community:masterfrom
Closed
release 21.11 backport gen linux fix#3387blaggacao wants to merge 24 commits intonix-community:masterfrom
blaggacao wants to merge 24 commits intonix-community:masterfrom
Conversation
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 15 to 16. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](cachix/install-nix-action@v15...v16) --- updated-dependencies: - dependency-name: cachix/install-nix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
This reverts commit 1e5c8e9.
Two misplaced quotations were introduced in `doBuild` by nix-community#2501, which caused the parameter expansion of DRY_RUN to include an extraneous tab. Since the flake uri is passed later into the command, Nix assumes the whitespace sequence as the flake uri and returns that it is not a valid flake reference. This PR removes the misplaced quotations in `doBuild` and also places the flake uri as the first argument for calls to `doBuildFlake` for consistency with `doBuildAttr`. Placing the uri first in the command line also guards against possible security issues if arbitrary uris are expanded prior to the user given uri. (cherry picked from commit 9de7722)
(cherry picked from commit 290a188)
…#2513) Since Rofi 1.7.1 (specifically davatorium/rofi@0e70d8a), the deprecated `theme` option in the `configuration` section no longer works. For 1.7.0 and up, `@theme "name"` is supposed to be used *after* the `configuration` block. (cherry picked from commit 3ec7f6f)
PR nix-community#810 (cherry picked from commit ea1794a)
(cherry picked from commit 78aa7cc)
These were renamed in v2021.08.28, commit 7e66846172165eb1f860f26f51f7a20790b0af29.
The fix for nix-community#2178 did not apply the patch to nix-darwin too. See: nix-community#2178 (comment) (cherry picked from commit 1fa809f)
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 5d4327c)
Currently activation is run with `sudo -i` this defaults to the user's login shell. This can lead to problems if the user's shell isn't set properly. By passing `-s` rather than `-i`, `sudo` runs `activate` in `SHELL` instead. We assume that at this point in the activation `SHELL` contains the path to a bash in the nix store. This should always be a valid shell to run the `activate` script with. From the `sudo` manual it seems like this cannot be fixed if `SHELL` isn't set at this point or by passing a command to `-s` because that command is then passed to the user's shell. (cherry picked from commit cf62e96)
…ty#2857) (nix-community#2858) Changing from `sudo -i` to `sudo -s` messes up activation when multiple users are managed. `--set-home` should have similar behavior to `-i` in that the activation script is run from the user's home directory. Fixes nix-community#2856 (cherry picked from commit e1fab01) Co-authored-by: toonn <toonn@toonn.io>
(cherry picked from commit 171702d)
PR nix-community#2833 Co-authored-by: David Arnold <dar@xoe.solutions> Co-authored-by: Florian Franzen <Florian.Franzen@gmail.com> (cherry picked from commit 2f58d0a)
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 16 to 17. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](cachix/install-nix-action@v16...v17) --- updated-dependencies: - dependency-name: cachix/install-nix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
When processing `publicKeys` entries, handle entries that contain multiple public keys (i.e. gpg --show-key returns multiple `pub` lines) properly, setting the trust level for each key. PR nix-community#2897 (cherry picked from commit 620ed19)
This makes definitions like
home.activation.foo = mkIf false "bar"
work, where previously they would complain about
`home.activation.foobar.data` being used but not defined.
The crucial part is that we don't call `convertAllToDags` in
`dagOf.merge`, because we need to process `mkIf`/`mkMerge` properties
first. So we let `attrEquivalent.merge` do its job normally, but give
it a type `dagEntryOf` that does the conversion.
Ideally this shouldn't require so much boilerplate; I'd like to
implement something like
types.changeInto dagContentType elemType dagEntryAnywhere
in Nixpkgs.
(cherry picked from commit 8db712a)
It can happen in some cases that home-manager first runs before gpg creates its homedir, and it creates it with 755 permissions which the user then needs to change by hand. Do this in the module instead: before linking files, make sure the homedir exists, and if it doesn't, create it with the right permissions. (cherry picked from commit 399a3df)
(cherry picked from commit 778af87)
…-community#2930) In esoteric setups, automatically setting GPG_TTY to current tty is not desired on every shell startup. This change adds configuration options to allow user to disable that if desired. (cherry picked from commit df60105)
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
15 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.
nix profiledagOfbehaviour withmkIf