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.
Semi-automatic update. These checks were performed:
- built on NixOS
- found 1.3 in filename of file in /nix/store/dhg81hbg0bm6cnxl0ky7vslbvsxbybsp-lemonbar-1.3
cc "@meisternu"
I have no idea why gobjectIntrospection even was in here. The only
library in there, libgirepository-1.0.so, is not used by awesome. It is
only used by lgi.so and that means it should be found via its RPATH.
The Pango path is not needed in $LD_LIBRARY_PATH ever since
gobjectIntrospection started patching .typelib files with absolute
paths. Relevant commits are 36bef2b267 from 2014
("gobject-introspection: refer to shlibs with absolute paths in
typelibs") and c420de6b05 from 2016 ("gobject-introspection: Fix
patching shared objects").
The above patches did not work for cairo, because cairo's typelib is a
bit "special". However, this was fixed by e44038bcca some days ago
("gobjectIntrospection: use absolute path for cairo GIR").
Thus, setting $GI_TYPELIB_PATH is enough so that all needed libraries
are found.
Fixes: https://github.com/NixOS/nixpkgs/issues/14164
Signed-off-by: Uli Schlachter <psychon@znc.in>
The following changes landed in master:
- Reset colors unconditionally (2f1ee69d4c75e210265dca732ff6c2ddd7f440f2)
- Document NixOS support (993f1b5a7bc2a41a353a104cff0763860c053c92)
- ya_int_song: improve configuration of playerctl properties (1f776cd5f1f4e89e6ebca3ca09feb7e09f79e79e)
Instead of polluting the environment with environment variables which
are inherited by processes spawned from awesome, use the command line
argument "--search" to add things to the search path.
cc #33169
The unstable branch of `yabar` received some minor useful changes:
- Fixed missprint (f1b1eff481)
- Update information on Debian installation (ce20fe75f7)
- Add indicator to show current indicator using `libxkbcommon` (5aa1fb5eb5)
The last change requires a `libxkbcommon` as additional build input.
Furthermore I thought that it might be better to add the dependencies of
unstable (namely `playerctl` and `libxkbcommon`) to the `unstable.nix`
to reduce the closure size of the stable build.
* bemenu: init at 2017-02-14
* velox: 2015-11-03 -> 2017-07-04
* orbment, velox: don't expose subprojects
the development of orbment and velox got stuck
their subprojects (bemenu, dmenu-wayland, st-wayland) don't work correctly outside of parent projects
so hide them to not confuse people
swc and wld libraries are unpopular and unlike wlc are not used by anything except velox
* pythonPackages.pydbus: init at 0.6.0
* way-cooler: 0.5.2 -> 0.6.2
* nixos/way-cooler: add module
* dconf module: use for wayland
non-invasive approach for #31293
see discussion at #32210
* sway: embed LD_LIBRARY_PATH for #32755
* way-cooler: switch from buildRustPackage to buildRustCrate #31150
The biggest benefit is that we no longer have to update the registry
package. This means that just about any cargo package can be built by
nix. No longer does `cargo update` need to be feared because it will
update to packages newer then what is available in nixpkgs.
Instead of fetching the cargo registry this bundles all the source code
into a "vendor/" folder.
This also uses the new --frozen and --locked flags which is nice.
Currently cargo-vendor only provides binaries for Linux and
macOS 64-bit. This can be solved by building it for the other
architectures and uploading it somewhere (like the NixOS cache).
This also has the downside that it requires a change to everyone's deps
hash. And if the old one is used because it was cached it will fail to
build as it will attempt to use the old version. For this reason the
attribute has been renamed to `cargoSha256`.
Authors:
* Kevin Cox <kevincox@kevincox.ca>
* Jörg Thalheim <Mic92@users.noreply.github.com>
* zimbatm <zimbatm@zimbatm.com>
* sxhkd: code style nitpicks
* sxhkd: add vyp as maintainer
* sxhkd: use list instead of string for makeFlags
* sxhkd: use fetchFromGitHub instead of fetchurl
* sxhkd: 0.5.6 -> 0.5.8
Unfortunately wlc 0.0.10 seems to be the cause for segfaults on sway,
way-cooler and orbment.
This will also build wlc with all optional packages (i.e. zlib,
valgrind and doxygen).
While the last wlc upgrade (05d79c03ec)
makes it possible to build sway 0.14.0 it also breaks the current build
of sway 0.13.0.
Unfortunately sway 0.14.0 segfaults on launch and I couldn't fix it yet
(there are multiple upstream issues as well). I'll overwrite the wlc
version for sway in order to have a usable version in nixpkgs for the
meantime.
By default, awesome will use "devel" as a version name
(or `git describe`). This has led to awesome always
showing "devel" for its version.
Some extensions depend on version information to figure
out what features they can use.
This change overrides the version for the build from the
derivations' `version` attribute.
GitHub does a redirect to https:// when you use http://
repology complains with:
“Homepage link "https://github.com/…" is dead (HTTP error 404) for more than a month.”
This will fix some of them (not all though)
* pkgs: refactor needless quoting of homepage meta attribute
A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.
* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit
* Fixed some instances
i3 loads its configuration from `~/.config/i3`, but in nix-based systems
you might want to build the config in `~/.nix-profile` using a nix
derivation, so `i3` needs to know where to look for the configuration
file.
Awesome can load SVG images, just like it can do PNG, through gdk.
The support for SVG images through GDK needs librvsg.
This commits adds the plumbing necessary in the wrapper that makes
awesome be able to load SVG images.
Without this, awesome will not load SVG images. The related error message is:
> Couldn't recognize the image file format for file
Which comes from gdk.
Contains changes that require updating user configs:
- command `compat' and the various def* compat commands were removed
- `msgwait', `rudeness', `startupmessage', `warp' are now variables
See http://git.savannah.nongnu.org/cgit/ratpoison.git/tree/NEWS
The SYSCONFDIR variable used in the Makefile servers two purposes:
1) During buildPhase, it is hardcoded into the executable as one of
the locations that will be searched for the i3blocks.conf config
file. We want this set to "/etc", so that "/etc/i3blocks.conf"
will be automatically loaded if it exists, as specified in the
manpage.
2) During installPhase, it specifies the location that the sample
i3blocks.conf should be installed to. We want this to be "$out/etc".
Case 2 was already handled correctly, but case 1 was not. This resulted
in i3blocks instead searching for i3blocks.conf in the default value of
SYSCONFDIR, which is "/usr/local/etc", a directory which generally does
not exist on NixOS. This commit remedies this problem by setting
SYSCONFDIR=/etc during buildPhase.
A minor stylistic fix (correcting a usage of "makeFlags" to "buildFlags"
in the expression) has also been applied in this commit.
