1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 05:31:22 +00:00
Commit graph

920 commits

Author SHA1 Message Date
Stefano Mazzucco 88f84c08d7 awesome: use makeWrapper rather than wrapProgram
Using wrapProgram makes so that the generated "awesome" wrapper duplicates its
command line options at every restart.

As @psychon puts it:

> AwesomeWM restarts via execvp(argv[0], argv). In NixOS, wrapProgram is used
> to generate a wrapper around the real binary. wrapProgram calls makeWrapper
> with --argv0 '$0'. I guess this is what makes awesomeWM run the wrapper again
> on restart. Without this --argv0 awesomeWM would directly restart itself
> instead of the wrapper, I think.
2019-05-06 21:08:55 +01:00
Daniel Schaefer 71fd2482b4
xmonad-with-packages: Remove ghc manpage
This package should only install the xmonad manpage but not GHC's (it
doesn't even install GHC in the path). Installing both manpages makes
this package conflict with the GHC derivation.

Fixes #60914
2019-05-04 23:49:27 +02:00
Michael Weiss 65f07c097d
swaybg: init at 1.0 2019-05-03 22:30:41 +02:00
Michael Weiss 1f1e075fb1
swayidle: 1.2 -> 1.3 2019-05-03 22:16:21 +02:00
Michael Weiss d43ea14abb
swaylock: 1.3 -> 1.4 2019-05-03 22:16:21 +02:00
Will Dietz 5f7f4e39d1
Merge pull request #60329 from stefano-m/awesome-fix-60232
awesome: refactor LUA_PATH env var and don't expose it at runtime
2019-04-27 19:37:09 -05:00
Michael Weiss 15010f0436
sway: Read the configuration from /etc before /nix/store (#60319)
This change will load all configuration files from /etc, to make it easy
to override them, but fallback to /nix/store/.../etc/sway/config to make
Sway work out-of-the-box with the default configuration on non NixOS
systems.
2019-04-27 22:38:18 +02:00
Stefano Mazzucco c973e15fb6 awesome: refactor LUA_PATH env var and don't expose it at runtime
This commit partly reinstates changes from 5465d6f that had been somehow
reverted in 17d3eb2.  Also, a comment has been added in the hope that future
changes won't do the same.

Additionally, refactor the LUA_PATH env var to ensure that the internal lgi lua
files can't be required explicitly and to avoid possible name clashes (this
fixes issue #60232).

Finally, rather than using prepending `?.lua` append `;;` to LUA_PATH. Quoting
@psychon:

> This is interpreted by Lua as "add the default search path here" (which does
> indeed contain ?.lua, but also contains more).

Testing done:

- Build with `nix-build -I /path/to/repo -A awesome`
- Start an X session with xterm only
- Start xephyr, e.g. `Xephyr :1 -name xephyr -screen 512x384 -ac -br -noreset &`
- Run awesome like `DISPLAY=:1.0 ./result/bin/awesome`. Additionally, add
  `--search` options to expose lua modules that have a name clash with lgi's
  internal ones (see #60232 for more details) and `require` them in `rc.lua` to
  prove that they are loaded correctly
2019-04-27 15:49:43 +01:00
Matthieu Coudron a364fcde13 i3easyfocus: 20180622 -> 20190411 (#59472)
introduced a new scheme to annotate windows.
2019-04-20 00:26:49 +02:00
ilikeavocadoes c034fb3c99 i3blocks: 1.4 -> unstable-2019-05-07 (#59099) 2019-04-07 16:56:33 +02:00
Bart Brouns 9afeb90e16 i3status-rust: 0.9.0.2019-02-15 -> 0.9.0.2019-03-21 (#58590) 2019-03-30 23:49:54 +01:00
Joachim F 91943f7ee3
Merge pull request #56132 from balsoft/master
wmfs: init at 201902
2019-03-22 11:01:30 +00:00
Александр Бантьев cd8a8bab4b wmfs: init at 201902 2019-03-22 13:46:36 +03:00
dywedir bca34cfd6e
wmfocus: 1.0.2 -> 1.1.2 2019-03-17 00:53:10 +02:00
Michael Weiss 578fe3f5a0
nixos/sway: Improve the module and adapt it to NixOS
This commit contains the following changes:
- nixos/sway: Remove the beta references
- sway: Drop buildDocs
- nixos/sway: Improve the documentation
- sway,nixos/sway: Adapt Sway to NixOS
  - Copy the default configuration file to /etc/sway/config (Sway will
    still load the identical file from the Nix store but this makes it
    easier to copy the default configuration file).
  - This will also remove all references to the Nix store from the
    default configuration file as they will eventually be garbage
    collected which is a problem if the user copies it.
  - I've also decided to drop the default wallpaper (alternatively we
    could copy it to a fixed location).
- nixos/sway: Drop the package option
2019-03-13 11:37:11 +01:00
Michael Weiss 45004c6f63
sway: Switch to 1.0
This is the result of executing:
git mv -f pkgs/applications/window-managers/sway/beta.nix pkgs/applications/window-managers/sway/default.nix
git mv -f nixos/modules/programs/sway-beta.nix nixos/modules/programs/sway.nix

And removing sway-beta from the following files:
pkgs/top-level/all-packages.nix
nixos/modules/module-list.nix
2019-03-12 22:29:39 +01:00
Michael Weiss 1240834176
sway-beta: Use the upstream patch to fix the build failure 2019-03-11 18:51:26 +01:00
Michael Weiss eb2a26f5c6
sway-beta: 1.0-rc5 -> 1.0 2019-03-11 17:02:25 +01:00
Michael Weiss 7bf4323082
sway-beta: 1.0-rc4 -> 1.0-rc5 2019-03-04 20:31:06 +01:00
R. RyanTM e0c354f18b bspwm: 0.9.6 -> 0.9.7
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bspwm/versions
2019-03-03 09:16:19 +01:00
Michael Weiss 0c89c444a2
sway-beta: 1.0-rc3 -> 1.0-rc4 2019-02-26 19:03:15 +01:00
Jörg Thalheim 6d09921b91
Merge pull request #55965 from Mic92/i3pystatus
i3pystatus: 2018-04-11 -> 2019-02-10
2019-02-26 14:12:35 +00:00
Michael Raskin 446520bb9b
Merge pull request #56026 from oxij/tree/move-defaults-to-package-files-half-cuda
all-packages.nix: move defaults to package files continues^2
2019-02-19 21:54:02 +00:00
Michael Weiss b790a74816
sway-beta: 1.0-rc2 -> 1.0-rc3 2019-02-18 22:26:16 +01:00
Jörg Thalheim 08012fb5d7
Merge pull request #55960 from Moredread/i3status-rust-bump
i3status-rust: 0.9.0.2018-10-02 -> 0.9.0.2019-02-15
2019-02-17 20:42:46 +00:00
Jörg Thalheim 3709050828
i3pystatus: 2018-04-11 -> 2019-02-10 2019-02-17 20:31:49 +00:00
André-Patrick Bubel 9a1e306652
i3status-rust: 0.9.0.2018-10-02 -> 0.9.0.2019-02-15 2019-02-17 19:23:55 +01:00
gnidorah e5a937bbdf
sway-beta: make man flag depend on parameter 2019-02-17 18:03:46 +01:00
Pascal Wittmann b45cebeb1e
Merge pull request #55906 from r-ryantm/auto-update/bspwm
bspwm: 0.9.5 -> 0.9.6
2019-02-17 10:49:38 +01:00
worldofpeace a9aa33eb90
Merge pull request #55816 from r-ryantm/auto-update/sxhkd
sxhkd: 0.5.9 -> 0.6.0
2019-02-17 04:04:57 +00:00
Alexey Shmalko 14a719c9e2
Merge pull request #55753 from dtzWill/fix/awesome-asciidoc
awesome: drop asciidoc, no longer needed when moved to asciidoctor
2019-02-17 02:18:53 +02:00
R. RyanTM c8503493ce bspwm: 0.9.5 -> 0.9.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bspwm/versions
2019-02-16 07:50:11 -08:00
xeji f83c284cf1
Merge pull request #55306 from r-ryantm/auto-update/i3-gaps
i3-gaps: 4.16 -> 4.16.1
2019-02-15 11:34:24 +01:00
R. RyanTM d30c2ba3a1 sxhkd: 0.5.9 -> 0.6.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sxhkd/versions
2019-02-15 02:27:42 -08:00
Uli Baum 69e64aa3ba i3-gaps: update releaseDate to match version 2019-02-14 22:09:32 +01:00
Will Dietz ff5676a216 awesome: drop asciidoc, no longer needed when moved to asciidoctor 2019-02-14 03:24:17 -06:00
Michael Raskin 8384cfe455
Merge pull request #55129 from oxij/tree/move-defaults-to-package-files
all-packages.nix: move defaults to package files
2019-02-13 20:04:08 +00:00
Michael Weiss 1a88aa9e0c
sway-beta: 1.0-rc1 -> 1.0-rc2 2019-02-11 19:30:52 +01:00
Pascal Wittmann 68aa14eea2 dwm: 6.1 -> 6.2 (#55354) 2019-02-07 11:40:16 +01:00
R. RyanTM d842a78c1d i3-gaps: 4.16 -> 4.16.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/i3-gaps/versions
2019-02-05 21:46:44 -08:00
Michael Weiss d2aa09f26d
swayidle: 1.1 -> 1.2 2019-02-05 23:34:22 +01:00
Michael Weiss 46503d069a
swaylock: 1.2 -> 1.3 2019-02-05 23:34:22 +01:00
Jan Malakhovski 69048c4357 xmonad_log_applet: move defaults to package file, cleanup
These are already inherited in the parent derivation.
2019-02-03 15:32:21 +00:00
Jan Malakhovski 1ad836b326 dwm: cleanup whitespace 2019-02-03 15:30:10 +00:00
Michael Weiss f73a8b22fb
sway-beta: 1.0-beta.2 -> 1.0-rc1 2019-02-03 15:35:07 +01:00
Franz Pletz e1f69f8f3c
Merge pull request #55084 from dtzWill/update/compton-git-5.1-rc2
compton-git: 5 -> 5.1-rc2, fix crashes and other regressions
2019-02-03 08:27:51 +00:00
Franz Pletz e91a102453
i3: 4.16 -> 4.16.1 2019-02-03 09:01:00 +01:00
Will Dietz 56e6a52cc7 compton-git: 5 -> 5.1-rc2, fix crashes and other regressions 2019-02-02 08:50:42 -06:00
Jörg Thalheim 585d2d79a1
compton: use stub git function instead of patching 2019-01-30 08:05:51 +00:00
Will Dietz 0658554ccc compton-git: 2 -> 5
https://github.com/yshui/compton/releases/tag/v3
https://github.com/yshui/compton/releases/tag/v4
https://github.com/yshui/compton/releases/tag/v5

Some fixes were made shortly after v5,
should pick them up or wait for next release.
2019-01-29 19:54:04 -06:00