This fixes an issue where corrupt-linux would use the kernel config from the
wrong version. The reason is that the package phases in customize-linux come
from inheriting the package in the 'linux' keyword argument, defaulting to
linux-libre. The kernel configuration comes in the configure phase. Since we
did not use this in the customize-linux in corrupt-linux, we would be using
the wrong configuration. For example, linux-6.7 would be built with the
linux-libre-6.6 kernel config rather than linux-libre-6.7, missing the new
CONFIG_BCACHEFS_FS option. Presumably all of our kernels were trying to use
the default linux-libre version kernel config rather than the correct one to
match their version. This should fix that.
* nongnu/packages/linux.scm (corrupt-linux): Use the 'linux' keyword argument
in customize-linux.
Reported-by: reedm and yelninei on the #nonguix IRC channel.
Followup to 5d5d496 to do the same for heroic.
* nongnu/packages/game-client.scm (heroic-container)[link-files]: Link all of
'share' from heroic-client.
Previously, only the .desktop files from steam-client were shared with
steam-container, and thus only those were available directly when installing
the steam package. This would miss things like the icons (needed in some
cases for tray support, for example, in waybar). Update to share all of
'share' to provide a more complete package for the user.
* nongnu/packages/game-client.scm (steam-container)[link-files]: Link all of
'share' from steam-client.
* nongnu/packages/editors (vscodium): Update to 1.85.2.24019.
[origin]: Download correct binary for different architectures.
[supported-systems]: List all supported architectures.
Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
In order to be able to use WiFi chip in P14s ThinkPad, the mt7921e module is
required. This commit enables it in kernels that do have it.
I originally implemented this using a list of additional option, same way
%default-extra-linux-options is done. However I quickly realized that
approach is not suitable for hardware enablement. The older versions do not
support the same drivers as the newer ones.
Solution is to create a new procedure that generates the list for a specific
kernel version and use it as a default value for #:configs.
* nongnu/packages/linux.scm (nonguix-extra-linux-options): New procedure.
(corrupt-linux): Use it as default value for #:configs.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Following the project's conventions, replace the λ symbol with the lambda
keyword.
* nongnu/packages/mozilla.scm (firefox-esr)
[arguments]<#:phases>['patch-SpeechDispatcherService.cpp]: Use lambda.
Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
Upstream added linux-libre@6.7 in 95a3aaf7ad37bb0717f2c9e3faf6f636b586d133 but
it is not yet the default.
* nongnu/packages/linux.scm (linux-6.7): New variable.
* nongnu/packages/linux.scm (%default-extra-linux-options,config->string):
Move into make-linux-xanmod.
(make-linux-xanmod): Adjust comments.
Move the base kernel produced by customize-linux out of let form.
[native-inputs]: Use prepend instead of append.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nongnu/packages/linux.scm (make-linux-xanmod-source): Patch upstream linux
source instead of downloading the auto-generated tarball from GitLab.
(make-linux-xanmod)[arguments]<#:phases>: Delete 'remove-localversion, moved
to snippet.
(linux-xanmod-source,linux-xanmod-lts-source): Adjust accordingly.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nongnu/packages/productivity.scm (anytype): Update to 0.37.3;
[arguments]<phases>: avoid hardcoding the icon path in anytype.desktop.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
The binary-unpack phase suffered from a problem for unknown binary file
extensions, see: !336 (comment 1709385147) . This patch fixes the
incorrect behavior by effectively restoring the state of the directory
tree before the phase.
* nonguix/build/binary-build-system.scm (binary-unpack): Restore the
environment as it was before this phase.
* nongnu/packages/clojure.scm (clj-kondo)[arguments]: No longer delete
'binary-unpack phase.
* nongnu/packages/game-development.scm (libsteam)[arguments]: dito.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nongnu/packages/game-client.scm (heroic-client, heroic-extra-client-libs,
heroic-container, heroic-nvidia-container, heroic, heroic-nvidia): New
variables.
* nonguix/multi-arch-container.scm (make-container-wrapper): Preserve "^SSL_"
for heroic to use curl.
(make-internal-script): Add symlink for "/usr/share/glib-2.0".
Steam installs .desktop files that refer to an executable called `steam'.
Installing steam-nvidia as the `steam-nvidia' executable breaks this, which
means Steam cannot be launched from its desktop icon. This also applies to
.desktop files for individual games generated by Steam, when they are copied
from `<ngc-sandbox-home>/.local/share/applications/'.
Fix this by always installing Steam's wrapper executable as `steam'. We add a
new field using "binary" to keep things shorter.
This has the downside that the `steam' and `steam-nvidia' packages cannot be
installed in the same profile, but likely people wouldn't want to do this
anyway.
Fixes#294.
* nongnu/packages/steam-client.scm (steam-nvidia-container)[binary-name]:
Specify for compatibility with .desktop files.
* nonguix/multiarch-container.scm (<nonguix-container>)[binary-name,
ngc-binary-name]: New field and accessor.
(nonguix-container->package): Use it to set correct executable name.
(make-internal-script): Use it in message.
Co-authored-by: John Kehayias <john.kehayias@protonmail.com>
Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
The new unpack-binary phase seems to not harmonize with patchelf always:
https://gitlab.com/nonguix/nonguix/-/merge_requests/336#note_1709385147
* nongnu/packages/clojure.scm (clj-kondo)[arguments]: Delete
'binary-unpack phase for now and change style to gexp.
[native-inputs]: change style to gexp.
[inputs]: dito.
* nongnu/packages/productivity.scm (anytype)[phases] Drop
'unpack-deb phase;
[native-inputs]: drop tar.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nongnu/packages/engineering.scm (lycheeslicer)[phases]<unpack>:
Replace with 'setup-cwd;
<symlink-binary-file>: there's no need anymore to care about the
environment-variables file;
[native-inputs]: drop tar.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nongnu/packages/messaging.scm (element-desktop)[phases]<unpack>:
Replace with 'setup-cwd;
<symlink-binary-file>: there's no need anymore to care about the
environment-variables file;
[native-inputs]: drop tar.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nongnu/packages/messaging.scm (signal-desktop)[phases]<unpack>:
Replace with 'setup-cwd;
<symlink-binary-file>: there's no need anymore to care about the
environment-variables file;
[native-inputs]: drop tar.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nongnu/packages/chrome.scm (make-google-chrome)[phases] Drop
'unpack-deb phase;
[native-inputs]: drop tar.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Fixes build with newer kernel version.
* nongnu/packages/linux.scm (r8168-linux-module): Update to 8.052.01.
[arguments]: Remove phases to fix build as proper fix is now in upstream.
* nongnu/packages/chrome.scm
(make-google-chrome)[arguments]<wrapper-plan>: Add some bundled
libraries and add nacl_helper only on stable channel;
(google-chrome-stable): update to 120.0.6099.71.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Inherited hplip package was updated to 3.23.12 in commit
392de3262ef388ec282d4311a7c2954e86e5aac9 of guix.
* nongnu/packages/printers.scm (hplip-plugin)[native-inputs]: Update sha256
hash for hplip-plugin.
The SteamVR dashboard can be a bit flaky in appearing or not. While it
doesn't seem to always require at-spi2-core, that does seem to help at other
times.
* nongnu/packages/steam-client.scm (steam-client-libs): Add at-spi2-core.
With libx11 ungrafted upstream in 5dcbd9accfcf0e97579604f57681c0565ae07ec2 we
no longer need our workaround for mesa. The upstream bug with grafts is not
fixed, however.
* nongnu/packages/steam-client.scm (steam-client-libs): Rename mesa-fixed to
mesa.
(libxdamage-fixed, mesa-fixed): Remove variables.
Upstream Guix defaults to linux-libre@6.5. Follow suit by making linux track
linux@6.5.
* nongnu/packages/linux.scm (linux): Update to linux-6.5.
Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
Reported upstream as <https://issues.guix.gnu.org/66033> by Panos
Alevropoulos. I don't think we can deprecate since the "helm" package is
still in Guix with that name.
* nongnu/packages/k8s.scm (helm): Rename to ...
(helm-kubernetes): ... this.
Firefox loads libspeechd.so.2 during runtime using PR_LoadLibrary and it fails
to locate the library in the store. Fix is to add extra phase that patches
the file to load the library using an absolute path.
* nongnu/packages/mozilla.scm (firefox-esr)
[phases]{'patch-SpeechDispatcherService.cpp}: New phase.
[inputs]: Add `speech-dispatcher`.
Fixes: https://gitlab.com/nonguix/nonguix/-/issues/284
Tested-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Adding linux@6.5 but not changing the default linux to this version until
upstream does as well.
* nongnu/packages/linux.scm (linux-6.5): New variable.
Co-authored-by: John Kehayias <john.kehayias@protonmail.com>
Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
Inherited hplip package was updated to 3.23.8 in commit
4a8c51c7be9ea22803a79d7214571718e5ff9bf2 of guix.
* nongnu/packages/printers.scm (hplip-plugin)[native-inputs]: Update sha256
hash for hplip-plugin.
Closes#248.
* nongnu/packages/fonts.scm (apple-font): New function
(font-apple-sf-pro): New variable.
(font-apple-sf-compact): New variable.
(font-apple-sf-mono): New variable.
(font-apple-sf-arabic): New variable.
(font-apple-new-york): New variable.
(font-apple-sf-symbols): New variable.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Finally, it's back! Using something like snixembed worked around this before
by using a different tray icon format.
* nongnu/packages/steam-client.scm (steam-client-libs): Add gdk-pixbuf.
* nonguix/multiarch-container.scm (make-internal-script): Add symlink to
/usr/share/mime.
Fixes#281.
Use the same fix as when this happened before with expat and fontconfig, as in
commit 3df99d7769.
* nongnu/packages/steam-client.scm (libxdamage-fixed, mesa-fixed): New
variables.
(steam-client-libs): Replace mesa with mesa-fixed.
* nongnu/packages/mozilla.scm (%firefox-esr-build-id, %firefox-build-id): Fix
typos in the comments.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nongnu/packages/mozilla.scm (firefox-esr): Update to 115.1.0esr.
[inputs]: Use `icu4c-73`.
[native-inputs]: Use `node-lts` and `rust-cbindgen-0.24`.
(firefox)[inputs]: Remove section.
[native-inputs]: No longer replace `node` and `rust-cbindgen-0.24` as
firefox-esr uses them now in recent enough versions.
Fixes CVE-2022-40982, CVE-2022-41804 and CVE-2023-23908.
* nongnu/packages/linux.scm (intel-microcode): Update to 20230808.
Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
Fix launching signal-desktop via its .desktop file (e.g. in a desktop
environment or launcher). This also affects element-desktop (to be fixed in
next commit).
Fixes#274.
* nongnu/packages/messaging.scm (signal-desktop)[phases]{unpack}: Fix the
.desktop file binary location to be 'bin' rather than 'lib/Signal'.
Inherited hplip package was updated to 3.23.5 in commit
57fe5b2338dfbb150d3921e9da3d9719fef6c9d9 of guix.
* nongnu/packages/printers.scm (hplip-plugin)[native-inputs]: Update sha256
hash for hplip-plugin.
Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
Adding linux@6.4 but not changing the default linux to this version until
upstream does as well.
* nongnu/packages/linux.scm (linux-6.4): New variable.
* nongnu/packages/firmware.scm (dump-file-chunk): New function.
(facetimehd-firmware): New variable.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nongnu/packages/linux.scm (linux-xanmod-lts-version,linux-xanmod-lts-source):
Update to 6.1.38.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nongnu/packages/linux.scm (linux-xanmod-version,linux-xanmod-source): Update
to 6.4.3.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nongnu/packages/electron.scm (define-module): Remove no longer
required modules
(electron)[build-system]: Use chromium-binary-build-system.
[patchelf-plan]: Drop it since the build system figures it out from the
wrapper plan;
[wrapper-plan]: New argument;
[phases]: Adjust to chromium-build-system;
[inputs]: Drop the inputs provided by the build system.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nongnu/packages/engineering.scm (lycheeslicer) [build-system]: Use
chromium-binary-build-system;
[patchelf-plan]: Drop it since the build system figures it out from the
wrapper plan;
[wrapper-plan]: New argument;
[phases]: Adjust to chromium-build-system;
[inputs]: Drop the inputs provided by the build system.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nongnu/packages/messaging.scm (signal-desktop) [build-system]: Use
chromium-binary-build-system;
[patchelf-plan]: Drop it since the build system figures it out from the
wrapper plan;
[wrapper-plan]: New argument;
[phases]: Adjust to chromium-build-system;
[inputs]: Drop the inputs provided by the build system.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nongnu/packages/messaging.scm (element-desktop) [build-system]: Use
chromium-binary-build-system;
[patchelf-plan]: Drop it since the build system figures it out from the
wrapper plan;
[wrapper-plan]: New argument;
[phases]: Adjust to chromium-build-system;
[inputs]: Drop the inputs provided by the build system.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nongnu/packages/chrome.scm (make-google-chrome) [patchelf-inputs]:
Drop them since the build system adds all inputs to the patchelf plan;
[build-system]: Use chromium-binary-build-system;
[patchelf-plan]: Drop it since the build system figures it out from the
wrapper plan;
[wrapper-plan]: New argument;
[phases]: Adjust to chromium-build-system;
[inputs]: Drop the inputs provided by the build system.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nongnu/packages/ncurses.scm (ncurses-rollup-patch): New variable.
(ncurses-5): Backport changes from upstream guix repo. Note that ncurses-5
fails to build with the new C++17 default, so we also need to explicitly force
C++11.
(ncurses/tinfo-5): Use gexp and remove outdated comment.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nongnu/packages/linux.scm (linux-xanmod-lts-version)
(linux-xanmod-lts-revision,linux-xanmod-lts-source,linux-xanmod-lts): New
variables.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
There is a warning spammed about missing 'xdg-user-dir' which doesn't seem to
cause any problems but let's add the missing input just in case.
* nongnu/packages/steam-client.scm (steam-client-libs): Add xdg-user-dirs.
This is needed to fix `guix pull' on non-x86 platforms.
* nongnu/packages/nvidia.scm (nvidia-driver)[arguments]: Add catch-all for
match install-plan.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
nonguix: Make container actually respect the ngc-shared and ngc-exposed fields.
* nongnu/packages/steam-client.scm (steam-container): New variable. This is to
export the container definition from steam.
(steam-nvidia-container): New variable. This is the container for steam-nvidia
and now inherits from steam-container.
(steam, steam-nvidia): Container definitions moved to steam-container and
steam-nvidia-container.
* nonguix/multiarch-container.scm (make-container-wrapper): Add ngc-exposed and
ngc-shared to expose and share lists.
Signed-off-by: ison <ison@airmail.cc>
The linux-lts commit introduced a breaking change by referring to the
nonexistent linux-libre-arm64-generic package variants. Even before that all
of nonguix's linux-arm64-generic package variants were based on the same
kernel version.
* nongnu/packages/linux.scm (linux-arm64-generic-6.0): Remove package variant.
(linux-arm64-generic-5.15): Ditto.
(linux-arm64-generic-lts): Ditto.
(linux-arm64-generic-5.10): New package variant.
(linux-arm64-generic-5.4): New package variant.
(linux-arm64-generic): Match version to most recent kernel in guix.
6.1 is the newest long-term support version of the kernel.
* nongnu/packages/linux.scm (linux-lts): Use linux-6.1
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
* nongnu/packages/linux.scm (rtl8812au-aircrack-ng-linux-module): Update
to 5.6.4.2-11.35308f4.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Fixes CVE-2023-32205, CVE-2023-32206, CVE-2023-32207, CVE-2023-32208,
CVE-2023-32209, CVE-2023-32210, CVE-2023-32211, CVE-2023-32212,
CVE-2023-32213, CVE-2023-32214, CVE-2023-32215, CVE-2023-32216 and
MFSA-TMP-2023-0002.
* nongnu/packages/mozilla.scm (firefox): Update to 113.0.
(rust-firefox): Set to `rust` as this is now `rust-1.67`.
The needed library libstdc++ was no longer found with the gcc updates in Guix.
* nongnu/packages/messaging.scm (signal-desktop)[inputs]: Remove gcc:lib. Add
libgccjit and libstdc++.
[phases]{wrap-where-patchelf-does-not-work}: Adjust for these inputs.
* nongnu/packages/steam-client.scm (steam-client-libs): Rename
fontconfig-fixed to fontconfig. The upstream bug has not been fixed but expat
has been ungrafted in core-updates so we no longer need to rewrite fontconfig.
Remove fontconfig-fixed as expat/fixed no longer exists in core-updates.
Piggy-back off of the patch list in Nixpkgs instead of maintaining our
own. This should make it easier to keep up to date so there's no need to
advise users to stick with Linux LTS releases any longer.
Though our existing patch list and Nixpkgs' differ the cumulative effect
is exactly the same except for two patches we have that Nix doesn't,
neither of which seem critical:
- broadcom-sta-debian-fix-kernel-warnings.patch
- broadcom-sta-fix_mac_profile_discrepancy.patch
Closes#246
* nongnu/packages/linux.scm (broadcom-sta): Replace patches
with code to fetch them from Nixpkgs.
[arguments]: Replace `linux-lts` with `linux`.
[description]: Remove Linux LTS recommendation.
* nongnu/packages/patches/broadcom-sta-debian-fix-kernel-warnings.patch: Remove.
* nongnu/packages/patches/broadcom-sta-fix_mac_profile_discrepancy.patch: Remove.
* nongnu/packages/patches/broadcom-sta-gcc.patch: Remove.
* nongnu/packages/patches/broadcom-sta-license.patch: Remove.
* nongnu/packages/patches/broadcom-sta-linux-4.11.patch: Remove.
* nongnu/packages/patches/broadcom-sta-linux-4.12.patch: Remove.
* nongnu/packages/patches/broadcom-sta-linux-4.15.patch: Remove.
* nongnu/packages/patches/broadcom-sta-linux-4.7.patch: Remove.
* nongnu/packages/patches/broadcom-sta-linux-4.8.patch: Remove.
* nongnu/packages/patches/broadcom-sta-linux-5.1.patch: Remove.
* nongnu/packages/patches/broadcom-sta-linux-5.10.patch: Remove.
* nongnu/packages/patches/broadcom-sta-linux-5.6.patch: Remove.
* nongnu/packages/patches/broadcom-sta-linux-5.9.patch: Remove.
* nongnu/packages/patches/broadcom-sta-null-pointer-fix.patch: Remove.
* nongnu/packages/patches/broadcom-sta-rdtscl.patch: Remove.
* README.org (Broadcom Wireless): Removed recommendation from
Broadcom Wireless section.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
There is a long list of libraries for LD_LIBRARY_PATH that could be refactored
into a LET form, but alas could not figure out with the many quotes and gexps
how right now. Or aomhost may only need a subset of these.
* nongnu/packages/messaging.scm (zoom)[patchelf-plan]: Add aomhost.
[phases]{wrap-where-patchelf-does-not-work}: Wrap it.
