Commit Graph

260108 Commits

Author SHA1 Message Date
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
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
Vladimír Čunát
85c8f75393
Merge #107603: firefox*: 84.0 -> 84.0.1 2020-12-28 08:39:21 +01:00
Jörg Thalheim
db103e0f98
Merge pull request #105395 from r-burns/ion
ion: fix build on darwin
2020-12-28 06:29:57 +00:00
Aaron Andersen
a08ed097c9
Merge pull request #107064 from aanderse/nixos/zabbixWeb
nixos/zabbixWeb: include DOUBLE_IEEE754 directive
2020-12-28 00:22:35 -05:00
Sandro
c7ab9b55b8
Merge pull request #107758 from freezeboy/update-charliecloud
charliecloud: 0.20 -> 0.21
2020-12-28 05:55:28 +01:00
Sandro
f37c665ea3
Merge pull request #107206 from romildo/upd.sweet
sweet: 1.10.5 -> 2.0
2020-12-28 04:10:15 +01:00
José Romildo Malaquias
0e73c49e02 luna-icons: 0.9 -> 0.9.1 2020-12-28 00:07:25 -03:00
José Romildo Malaquias
a6eab7f4fa
Merge pull request #107742 from romildo/upd.xfce
xfce: update src to use new git repository
2020-12-27 23:53:01 -03:00
Kamus Hadenes
950c5e1879
Rambox Pro 1.3.2 > 1.4.1 (#104997) 2020-12-28 02:51:09 +01:00
Sandro
add86ae9c7
Merge pull request #93697 from yoctocell/typeracer-init 2020-12-28 02:48:32 +01:00
Sandro
a08cfe75a2
Merge pull request #102155 from SCOTT-HAMILTON/ptouch-print
ptouch-print: init at 1.4.3
2020-12-28 02:39:15 +01:00
Sandro
c0a21cbede
Merge pull request #107653 from rmcgibbo/gpy 2020-12-28 02:38:07 +01:00
zowoq
8c2b85597d kapp: 0.34.0 -> 0.35.0 2020-12-28 11:36:52 +10:00
Billy J Rhoades II
8d214984a6 kapp: init at 0.34.0
Added kapp at 0.34.0 which is currently missing in nixpkgs
2020-12-28 11:36:52 +10:00
Sandro
00ddafe1eb
Merge pull request #107706 from fabaff/nuclei
nuclei: init at 2.2.0
2020-12-28 02:36:34 +01:00
Sandro
1691ceee22
Merge pull request #107629 from marsam/update-pykka 2020-12-28 02:30:12 +01:00
Jörg Thalheim
6baecc0abb
aucdtect: remove (#107611)
* aucdtect: remove

* Update pkgs/top-level/aliases.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Co-authored-by: Peter Hoeg <peter@hoeg.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2020-12-28 09:26:52 +08:00
Michael Lingelbach
3325053530 neochat: re-add kitemmodels and qtgraphicaleffects to build inputs for non-nixos systems 2020-12-28 09:18:13 +08:00
Sandro
31c87fb128
Merge pull request #101232 from i077/mkdx-vim/init
vimPlugins.mkdx: init at 2020-10-12
2020-12-28 02:17:42 +01:00
Sandro
f5b304e81a
Merge pull request #107704 from fabaff/dnsx
dnsx: init at 1.0.1
2020-12-28 02:17:03 +01:00
Mario Rodas
70eebb05ff
Merge pull request #107705 from sternenseemann/lowdown-0.7.5
lowdown: 0.7.4 -> 0.7.5
2020-12-27 19:42:23 -05:00
Mario Rodas
0dfa6dc11e
Merge pull request #107732 from fabaff/ffuf
ffuf: init at 1.1.0
2020-12-27 19:39:48 -05:00