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.
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
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
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
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
There’s nothing wrong with unstable packages when they are maintained
and frequently updated. However, when they become out-of-date, as many
do, it is usually best to just get rid of them as the stable version
is become newer than the unstable version. This removes any packages
called "unstable" that have not been updated in over 1 year. Affected
packages include:
- isyncUnstable
- sxhkd-unstable
- dosbox-unstable
Revert "treewide: remove unstable packages"
This reverts commit df01b0b37a04624cfe6f8d2ccb42b99289841b68.
this version is deprecated and no longer maintained by upstream:
https://awesomewm.org/download/
Two years should have been enough for people to upgrade.
Since years I'm not maintaining anything of the list below other
than some updates when I needed them for some reason. Other people
is doing that maintenance on my behalf so I better take me out but
for very few packages. Finally!
76999cc40e changed some hashes resulting in this PR being technically
a mass rebuild. To avoid this, I am restoring some of the hashes (even
though it seems silly). My main goal is to get this PR merged quickly
as treewide changes like this get out-of-date quickly.
This commit should be reverted on the next mass rebuild.
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.
Misc...
- qtikz: use libsForQt5.callPackage
This ensures we get the right poppler.
- rewrites:
docbook5_xsl -> docbook_xsl_ns
docbook_xml_xslt -> docbook_xsl
diffpdf: fixup
* treewide: http -> https sources
This updates the source urls of all top-level packages from http to
https where possible.
* buildtorrent: fix url and tab -> spaces
The stable build for `yabar` is currently broken: https://hydra.nixos.org/build/75989172
Main reason is that the inline function `ya_setup_prefix_suffix` is
supposed to be an inline function, but was insufficiently declared as
such which broke the compiler recently with the following message:
```
gcc -std=c99 -Iinclude -pedantic -Wall -Os `pkg-config --cflags pango pangocairo libconfig` -DVERSION=\"0.4.0\" -D_POSIX_C_SOURCE=199309L -DYA_INTERNAL -DYA_DYN_COL -DYA_ENV_VARS -DYA_INTERNAL_EWMH -c -o src/intern_blks/ya_intern.o src/intern_blks/ya_intern.c
gcc -o yabar src/ya_main.o src/ya_draw.o src/ya_exec.o src/ya_parse.o src/intern_blks/ya_intern.o -lxcb -lpthread -lxcb-randr -lxcb-ewmh `pkg-config --libs pango pangocairo libconfig`
src/intern_blks/ya_intern.o: In function `ya_int_date':
ya_intern.c:(.text+0x49): undefined reference to `ya_setup_prefix_suffix'
src/intern_blks/ya_intern.o: In function `ya_int_uptime':
ya_intern.c:(.text+0xf4): undefined reference to `ya_setup_prefix_suffix'
src/intern_blks/ya_intern.o: In function `ya_int_brightness':
ya_intern.c:(.text+0x1d8): undefined reference to `ya_setup_prefix_suffix'
src/intern_blks/ya_intern.o: In function `ya_int_bandwidth':
ya_intern.c:(.text+0x377): undefined reference to `ya_setup_prefix_suffix'
src/intern_blks/ya_intern.o: In function `ya_int_cpu':
ya_intern.c:(.text+0x6de): undefined reference to `ya_setup_prefix_suffix'
src/intern_blks/ya_intern.o:ya_intern.c:(.text+0x924): more undefined references to `ya_setup_prefix_suffix' follow
collect2: error: ld returned 1 exit status
make: *** [Makefile:18: yabar] Error 1
```
This issue has been fixed on master (see
9779a5e04b)
which is why `nixos.yabar-unstable` remained functional.
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/fvwm/versions.
These checks were done:
- built on NixOS
- /nix/store/kycw0a7gqxh0v7lxq001j9sjysnz1v6h-fvwm-2.6.8/bin/fvwm2 passed the binary check.
- /nix/store/kycw0a7gqxh0v7lxq001j9sjysnz1v6h-fvwm-2.6.8/bin/fvwm-perllib passed the binary check.
- /nix/store/kycw0a7gqxh0v7lxq001j9sjysnz1v6h-fvwm-2.6.8/bin/fvwm-convert-2.6 passed the binary check.
- /nix/store/kycw0a7gqxh0v7lxq001j9sjysnz1v6h-fvwm-2.6.8/bin/fvwm-menu-xlock passed the binary check.
- /nix/store/kycw0a7gqxh0v7lxq001j9sjysnz1v6h-fvwm-2.6.8/bin/fvwm-menu-directory passed the binary check.
- Warning: no invocation of /nix/store/kycw0a7gqxh0v7lxq001j9sjysnz1v6h-fvwm-2.6.8/bin/fvwm-menu-desktop had a zero exit code or showed the expected version
- /nix/store/kycw0a7gqxh0v7lxq001j9sjysnz1v6h-fvwm-2.6.8/bin/fvwm-menu-headlines passed the binary check.
- Warning: no invocation of /nix/store/kycw0a7gqxh0v7lxq001j9sjysnz1v6h-fvwm-2.6.8/bin/xpmroot had a zero exit code or showed the expected version
- /nix/store/kycw0a7gqxh0v7lxq001j9sjysnz1v6h-fvwm-2.6.8/bin/fvwm passed the binary check.
- /nix/store/kycw0a7gqxh0v7lxq001j9sjysnz1v6h-fvwm-2.6.8/bin/FvwmCommand passed the binary check.
- Warning: no invocation of /nix/store/kycw0a7gqxh0v7lxq001j9sjysnz1v6h-fvwm-2.6.8/bin/fvwm-root had a zero exit code or showed the expected version
- /nix/store/kycw0a7gqxh0v7lxq001j9sjysnz1v6h-fvwm-2.6.8/bin/fvwm-config passed the binary check.
- /nix/store/kycw0a7gqxh0v7lxq001j9sjysnz1v6h-fvwm-2.6.8/bin/fvwm-bug passed the binary check.
- 10 of 13 passed binary check by having a zero exit code.
- 3 of 13 passed binary check by having the new version present in output.
- found 2.6.8 with grep in /nix/store/kycw0a7gqxh0v7lxq001j9sjysnz1v6h-fvwm-2.6.8
- directory tree listing: https://gist.github.com/94e21d8ab3a4808980c94f1fbb20f1b6
- du listing: https://gist.github.com/6db3d3e079f7808b93a1bbc20e5f396e
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/weston/versions.
These checks were done:
- built on NixOS
- ran ‘/nix/store/0354z3f09fdz91z0gypm630mwyyw9m6d-weston-4.0.0/bin/weston -h’ got 0 exit code
- ran ‘/nix/store/0354z3f09fdz91z0gypm630mwyyw9m6d-weston-4.0.0/bin/weston --help’ got 0 exit code
- ran ‘/nix/store/0354z3f09fdz91z0gypm630mwyyw9m6d-weston-4.0.0/bin/weston --version’ and found version 4.0.0
- ran ‘/nix/store/0354z3f09fdz91z0gypm630mwyyw9m6d-weston-4.0.0/bin/wcap-decode --help’ got 0 exit code
- found 4.0.0 with grep in /nix/store/0354z3f09fdz91z0gypm630mwyyw9m6d-weston-4.0.0
- directory tree listing: https://gist.github.com/01f9658faac9a7816ccf1ca44d11fe15
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.
This update was made based on information from https://repology.org/metapackage/bspwm/versions.
These checks were done:
- built on NixOS
- ran `/nix/store/w78rv4f7aq8nww3k2nmmkwfgl0mcqf60-bspwm-0.9.4/bin/bspwm -h` got 0 exit code
- ran `/nix/store/w78rv4f7aq8nww3k2nmmkwfgl0mcqf60-bspwm-0.9.4/bin/bspwm --help` got 0 exit code
- ran `/nix/store/w78rv4f7aq8nww3k2nmmkwfgl0mcqf60-bspwm-0.9.4/bin/bspwm --version` and found version 0.9.4
- ran `/nix/store/w78rv4f7aq8nww3k2nmmkwfgl0mcqf60-bspwm-0.9.4/bin/bspwm --help` and found version 0.9.4
- found 0.9.4 with grep in /nix/store/w78rv4f7aq8nww3k2nmmkwfgl0mcqf60-bspwm-0.9.4
- directory tree listing: https://gist.github.com/7ea8e79c97fb5b6594093a8d96aeb4e0
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.
This update was made based on information from https://repology.org/metapackage/sxhkd/versions.
These checks were done:
- built on NixOS
- ran `/nix/store/psgpqlc79whix5834kvvs9klgiyinl72-sxhkd-0.5.9/bin/sxhkd -h` got 0 exit code
- ran `/nix/store/psgpqlc79whix5834kvvs9klgiyinl72-sxhkd-0.5.9/bin/sxhkd --help` got 0 exit code
- ran `/nix/store/psgpqlc79whix5834kvvs9klgiyinl72-sxhkd-0.5.9/bin/sxhkd -v` and found version 0.5.9
- ran `/nix/store/psgpqlc79whix5834kvvs9klgiyinl72-sxhkd-0.5.9/bin/sxhkd --version` and found version 0.5.9
- ran `/nix/store/psgpqlc79whix5834kvvs9klgiyinl72-sxhkd-0.5.9/bin/sxhkd --help` and found version 0.5.9
- found 0.5.9 with grep in /nix/store/psgpqlc79whix5834kvvs9klgiyinl72-sxhkd-0.5.9
- directory tree listing: https://gist.github.com/7b7f60bf79af2063b4100fb74b4c468c
Uses the HTTPS url for cases where the existing URL has a permanent
redirect. For each domain, at least one fixed derivation URL was
downloaded to test the domain is properly serving downloads.
Also fixes jbake source URL, which was broken.
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:
- built on NixOS
- ran `/nix/store/pq9arr25llfihg0gmhbsl411d6ycvbrv-sawfish-1.12.90/bin/sawfish --help` got 0 exit code
- ran `/nix/store/pq9arr25llfihg0gmhbsl411d6ycvbrv-sawfish-1.12.90/bin/sawfish --version` and found version 1.12.90
- ran `/nix/store/pq9arr25llfihg0gmhbsl411d6ycvbrv-sawfish-1.12.90/bin/sawfish --help` and found version 1.12.90
- ran `/nix/store/pq9arr25llfihg0gmhbsl411d6ycvbrv-sawfish-1.12.90/bin/.sawfish-wrapped --help` got 0 exit code
- ran `/nix/store/pq9arr25llfihg0gmhbsl411d6ycvbrv-sawfish-1.12.90/bin/.sawfish-wrapped --version` and found version 1.12.90
- ran `/nix/store/pq9arr25llfihg0gmhbsl411d6ycvbrv-sawfish-1.12.90/bin/.sawfish-wrapped --help` and found version 1.12.90
- found 1.12.90 with grep in /nix/store/pq9arr25llfihg0gmhbsl411d6ycvbrv-sawfish-1.12.90
Negative reasoning like `allBut` is a bad idea with an open world of
platforms. Concretely, if we add a new, quite different sort of
platform, existing packages with `allBut` will claim they work on it
even though they probably won't.
