Commit graph

260306 commits

Author SHA1 Message Date
github-actions[bot] ac03278035
Merge master into staging-next 2020-12-28 18:34:55 +00:00
Timo Kaufmann 90d95d4513
Merge pull request #107148 from Atemu/linux_lqx-init
linux_lqx: init at 5.9.15
2020-12-28 18:35:15 +01:00
Lassulus 4b210ca92a
Merge pull request #107282 from 0x4A6F/master-dasel
dasel: add installCheckPhase test
2020-12-28 17:34:18 +01:00
Ivan b90c5cb703
XMonad: configured recompile (#107696)
* nixos/xmonad: xmonad config w/ghc+xmessage

When the "config" option isn't set, we use xmonad-with-packages to
provide xmonad with runtime access to an isolated ghc, ensuring it can
recompile and exec a user's local config (e.g. $HOME/.xmonad/xmonad.hs)
regardless of which ghc (if any) is on PATH.

When the "config" option is set, however, we compile a configured xmonad
executable upfront (during nixos-rebuild), and prior to this commit, it
was not provided with runtime access to an isolated ghc.

As a result, with the "config" option set, it was not possible
to recompile and exec a user's local config unless there was a
compatible version of ghc on PATH with the necessary packages (xmonad,
xmonad-contrib, etc.) in its package database. Adding such a ghc to
environment.systemPackages, e.g.

  (haskellPackages.ghcWithPackages (ps: with ps; [xmonad xmonad-contrib]))

is problematic because it adds both ghc and an unconfigured xmonad to
PATH, e.g.

  $ ls -l $(which xmonad ghc)
  lrwxrwxrwx ... /run/current-system/sw/bin/ghc -> /nix/store/...-ghc-8.10.2-with-packages/bin/ghc
  lrwxrwxrwx ... /run/current-system/sw/bin/xmonad -> /nix/store/...-ghc-8.10.2-with-packages/bin/xmonad

Having the unconfigured xmonad on PATH is particularly bad because
restarting xmonad will dump the user into the unconfigured version, and
if no local config exists (e.g. in $HOME/.xmonad/xmonad.hs), they'll be
left in this unconfigured state.

In this commmit, we give the configured xmonad runtime access to ghc
like xmonad-with-packages does for the unconfigured version. The aim
is to allow the user to switch between the nixos module's config and a
local config (e.g. $HOME/.xmonad/xmonad.hs) at will, so they can try out
config changes without performing a nixos-rebuild.

Since the xmonad on PATH is the configured executable, there's no
danger a user could unwittingly restart into the unconfigured version,
and because xmonad will refuse to recompile when no local config
exists, there's no danger a user could unwittingly recompile into an
unconfigured version.

Given that a local config exists, the recompile/restart behavior depends
on two factors:
- which entry point is used
  * 'XMonad.xmonad' (default)
  * 'XMonad.launch' (recommended in "config" option description)
- what operation is triggered (i.e. via mod+q)
  * `spawn "xmonad --recompile && xmonad --restart"` (default)
  * `restart "xmonad" True`
  * custom function

If the default 'XMonad.xmonad' entrypoint and default mod+q operation
are used, hitting mod+q will compile and exec the local config, which
will remain in use until next time the display manager is restarted.

If the entrypoint is changed to 'XMonad.launch' but mod+q left with its
default operation, hitting mod+q will have no visible effect. The logs
(as seen by running `journalctl --identifier xmonad --follow`) will show
an error,
  X Error of failed request:  BadAccess (attempt to access private resource denied)
which indicates that the shell was unable to start xmonad because
another window manager is already running (namely, the nixos-configured
xmonad).
https://wiki.haskell.org/Xmonad/Frequently_asked_questions#X_Error_of_failed_request:_BadAccess_.28attempt_to_access_private_resource_denied.29

Changing the mod+q operation to `restart "xmonad" True` (as recommended
in the "config" option's description) will allow a restart of the
nixos-configured xmonad to be triggeredy by hitting mod+q.

Finally, if the entrypoint is 'XMonad.launch', mod+q has been
bound to `restart "xmonad" True` and another key bound to a custom
recompile/restart function (e.g. `compileRestart` as shown in the
"config" option example), the user can switch between the nixos module's
config and their local config, with the custom key switching to the
local config and mod+q switching back.

* nixos/xmonad: refactor let binding

* nixos/xmonad: refactor (eliminate duplicate code)

* nixos/xmonad: install man pages

Prior to this commit, man pages were not installed if the "config"
option was set.

* nixos/xmonad: comment grammar fixups

* nixos/xmonad: writeStateToFile in example config

Calling writeStateToFile prior to recompiling and restarting allows
state (workspaces, etc.) to be preserved across the restart.

* nixos/xmonad: add ivanbrennan to maintainers

* nixos/xmonad: adjust compileRestart example

* nixos/xmonad: add missing import to example config
2020-12-28 17:27:36 +01:00
Tim Steinbach 80e3ca6f4a
linux: 5.10-rc6 -> 5.11-rc1 2020-12-28 11:22:57 -05:00
Florian Klink 0b8b53eec0
Merge pull request #107807 from flokli/libraspberrypi-fix-output
libraspberrypi: fix output
2020-12-28 17:08:36 +01:00
elseym bee49dfd0e unifi: rename packages
- renames unifiStable to unifi5
- renames unifiBeta to unifi6
- aliases unifi to unifi6
- aliases unifiStable to unifi6 for backward compatibility
2020-12-28 17:04:20 +01:00
elseym df94250243 unifiStable: 5.14.23 -> 6.0.43 2020-12-28 17:04:20 +01:00
Francesco Gazzetta 6792a171e8
mindustry,mindustry-server: 121.4 -> 122 (#107646) 2020-12-28 17:03:31 +01:00
Florian Klink ce709163f2 libraspberrypi: fix output
libraspberrypi provided an empty directory. The during
https://github.com/NixOS/nixpkgs/pull/107637, this was refactored to use
cmakeFlags.

cmakeFlags can't use `$out` directly. `$out` is a bash variable, so to
use it there, `${placeholder "out"}` is needed, otherwise it'll
pick `"$out"` literally.
2020-12-28 16:55:11 +01:00
Sandro 3f8706620d
Merge pull request #107761 from eliasp/skypeforlinux-exec-path
skypeforlinux: fix Exec paths in further desktop files
2020-12-28 16:53:52 +01:00
Tim Steinbach b24e814e14
linux: 5.10.2 -> 5.10.3 2020-12-28 10:48:04 -05:00
Tim Steinbach 83bcf66747
xterm: 362 → 363 2020-12-28 10:48:04 -05:00
Tim Steinbach d7a66c7d4d
sbt-extras: 2020-12-17 → 2020-12-26 2020-12-28 10:48:03 -05:00
Tim Steinbach 9e88afeb10
oh-my-zsh: 2020-12-16 → 2020-12-27 2020-12-28 10:48:00 -05:00
Mario Rodas 63e804bc85
Merge pull request #107760 from freezeboy/update-chamber
chamber: 2.8.2 -> 2.9.0
2020-12-28 10:15:18 -05:00
Aaron Andersen 8ff0302c7a
Merge pull request #107155 from aanderse/redmine
redmine: wrap rdm-mailhandler.rb for inbound e-mail capabilities
2020-12-28 10:06:46 -05:00
Sandro 1995d8d919
Merge pull request #107776 from romildo/upd.luna-icons
luna-icons: 0.9 -> 0.9.1
2020-12-28 15:57:33 +01:00
freezeboy 113c1ce19a chamber: 2.8.2 -> 2.9.0 2020-12-28 14:29:26 +01:00
github-actions[bot] d5506c4c59
Merge master into staging-next 2020-12-28 12:24:08 +00:00
Florian Klink f71e439688 nixos/acme: fix typo in docs 2020-12-28 13:19:15 +01:00
Mario Rodas c8ce8951b7
Merge pull request #107561 from r-ryantm/auto-update/python3.7-asyncssh
python37Packages.asyncssh: 2.4.2 -> 2.5.0
2020-12-28 07:09:02 -05:00
Mario Rodas 24a8b55ba6
Merge pull request #107754 from freezeboy/update-cgal
cgal: 5.1.1 -> 5.2
2020-12-28 07:03:05 -05:00
Mario Rodas 7a7ada02f0
Merge pull request #107780 from marsam/update-flite
flite: 2.1.0 -> 2.2
2020-12-28 06:59:51 -05:00
Mario Rodas 814464a239
Merge pull request #107773 from marsam/fix-sonic-darwin
espeak-ng: enable on darwin
2020-12-28 06:58:43 -05:00
freezeboy ad13f0e569 cjdns: 21 -> 21.1 2020-12-28 12:17:39 +01:00
Maximilian Bosch 5239dc4d9e
Merge pull request #107786 from freezeboy/update-atop
atop: 2.4.0 -> 2.6.0
2020-12-28 11:13:22 +01:00
Peter Hoeg 4fc53b59ae lucky-cli: 0.24 -> 0.25 2020-12-28 16:21:23 +08:00
Peter Hoeg b8514a1727 crystal2nix: unstable-2018-07-31 -> 0.1.0 2020-12-28 16:21:23 +08:00
Peter Hoeg 61626d70e5 buildCrystalPackage: support shards v0.12 properly 2020-12-28 16:21:23 +08:00
Peter Hoeg 7505046458 shards: minor cleanups 2020-12-28 16:21:23 +08:00
zowoq 3f73b92270 .github/workflows/editorconfig.yml: use api for list of changed files
faster than doing a full clone and using git diff
2020-12-28 17:48:26 +10:00
Frederik Rietdijk f3139e90ca Merge "Bump gcc to gcc10 and binutils to 2.34 #89793" into staging-next 2020-12-28 08:45:56 +01:00
Frederik Rietdijk 92cc19490e Merge staging into staging-next 2020-12-28 08:45:43 +01:00
Lucas Ransan 22daf1c8ff mp4v2: fix build on gcc10 2020-12-28 08:43:33 +01:00
Lucas Ransan 68a4db3446 syslinux: fix build on gcc10 2020-12-28 08:43:33 +01:00
Lucas Ransan 97a279c71d libgcrypt: force noexecstack 2020-12-28 08:43:33 +01:00
Lucas Ransan 6274a5bbb3 wine: re-enable stripping 2020-12-28 08:43:33 +01:00
Lucas Ransan 2cb2a5348e nixUnstable: fix build on gcc10 2020-12-28 08:43:33 +01:00
Lucas Ransan a909a45e04 libopus: disable tests on i686
test_unit_LPC_inv_pred_gain fails
2020-12-28 08:43:33 +01:00
Lucas Ransan 31ed763ea0 libreoffice-still: build with gcc9
Fails in multiple ways when building with gcc10.
Moving to a newer version may solve this.
2020-12-28 08:43:33 +01:00
Lucas Ransan f21b93c362 range-v3: fix build on gcc10 2020-12-28 08:43:33 +01:00
Lucas Ransan 7fd60b3c97 p7zip: fix build on gcc10 2020-12-28 08:43:32 +01:00
Lucas Ransan 1c89832fd5 refind: fix build on gcc10 2020-12-28 08:43:32 +01:00
Lucas Ransan 188f1375d8 cpython: fix ctypes.util.find_library 2020-12-28 08:43:32 +01:00
luc65r f6fceb321b Remove trailing whitespaces and fix indentation 2020-12-28 08:43:32 +01:00
luc65r e52f7881ef searx: fix build 2020-12-28 08:43:32 +01:00
luc65r decbe0dc9c vsftpd: fix build with gcc10 2020-12-28 08:43:32 +01:00
luc65r a95fc9ff16 syslinux: build with gcc9
build fails with "undefined reference to `strlen'" on gcc10
2020-12-28 08:43:32 +01:00
luc65r c4c1b328c7 pythonPackages.coveralls: delete restrictions for coverage version 2020-12-28 08:43:32 +01:00