mirror of
https://gitlab.com/nonguix/nonguix.git
synced 2025-10-02 02:14:59 +00:00
Compare commits
11 commits
f55bf936d6
...
89eb30ab0e
Author | SHA1 | Date | |
---|---|---|---|
|
89eb30ab0e | ||
|
25d7a8091c | ||
|
c33db8571a | ||
|
2fe28d2a1b | ||
|
9302c6319b | ||
|
63c7e04386 | ||
|
7a67115e0d | ||
|
017e4bf864 | ||
|
0864aa6ba5 | ||
|
0531ba5050 | ||
|
bc2a73d7a8 |
5 changed files with 75 additions and 21 deletions
47
guix/import/firefox.scm
Normal file
47
guix/import/firefox.scm
Normal file
|
@ -0,0 +1,47 @@
|
||||||
|
;;; SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
|
||||||
|
|
||||||
|
;;; This file is not part of GNU Guix but requires this naming scheme
|
||||||
|
;;; so that the %firefox-updater is properly read when using
|
||||||
|
;;; `guix refresh -L$(pwd) firefox' in nonguix root.
|
||||||
|
|
||||||
|
(define-module (guix import firefox)
|
||||||
|
#:use-module (guix import json)
|
||||||
|
#:use-module (guix memoization)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix upstream)
|
||||||
|
#:export (%firefox-updater))
|
||||||
|
|
||||||
|
(define firefox-json-url "https://product-details.mozilla.org/1.0/firefox_versions.json")
|
||||||
|
|
||||||
|
(define firefox-versions
|
||||||
|
(memoize
|
||||||
|
(lambda _
|
||||||
|
(let ((alist (json-fetch firefox-json-url)))
|
||||||
|
(list (cons "firefox" (assoc-ref alist "LATEST_FIREFOX_VERSION"))
|
||||||
|
(cons "firefox-esr" (assoc-ref alist "FIREFOX_ESR")))))))
|
||||||
|
|
||||||
|
(define* (latest-release package #:key (version #f) partial-version?)
|
||||||
|
"Return an <upstream-source> for the latest-release of PACKAGE."
|
||||||
|
(let* ((name (package-name package))
|
||||||
|
(version (or version (assoc-ref (firefox-versions) name))))
|
||||||
|
(upstream-source
|
||||||
|
(package name)
|
||||||
|
(version version)
|
||||||
|
(urls
|
||||||
|
(list (string-append "https://archive.mozilla.org/pub/firefox/releases/"
|
||||||
|
version "/source/firefox-"
|
||||||
|
version ".source.tar.xz"))))))
|
||||||
|
|
||||||
|
(define (firefox-package? package)
|
||||||
|
"Return true if PACKAGE is Firefox."
|
||||||
|
(member (package-name package) (list "firefox" "firefox-esr")))
|
||||||
|
|
||||||
|
(define %firefox-updater
|
||||||
|
(upstream-updater
|
||||||
|
(name 'firefox)
|
||||||
|
(description "Updater for Firefox packages")
|
||||||
|
(pred firefox-package?)
|
||||||
|
(import latest-release)))
|
||||||
|
|
||||||
|
;;; firefox.scm ends here.
|
|
@ -105,12 +105,13 @@
|
||||||
(description "Heroic is an Open Source Game Launcher. Right now it supports launching
|
(description "Heroic is an Open Source Game Launcher. Right now it supports launching
|
||||||
games from the Epic Games Store using Legendary, GOG Games using our custom
|
games from the Epic Games Store using Legendary, GOG Games using our custom
|
||||||
implementation with gogdl and Amazon Games using Nile.")
|
implementation with gogdl and Amazon Games using Nile.")
|
||||||
(license license:gpl3)))
|
(license license:gpl3)
|
||||||
|
(supported-systems '("x86_64-linux"))))
|
||||||
|
|
||||||
(define steam-client
|
(define steam-client
|
||||||
(package
|
(package
|
||||||
(name "steam-client")
|
(name "steam-client")
|
||||||
(version "1.0.0.83")
|
(version "1.0.0.84")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -118,7 +119,7 @@ implementation with gogdl and Amazon Games using Nile.")
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"10lgmjsada0n2a4h1vgrnwcjcka7vp4igy82f1n99zbyrjq845kr"))
|
"0i3v0zz36x7v81qslvfbiby57hk96hn15w4xxal1lgvrb0npdyii"))
|
||||||
(file-name (string-append name "-" version ".tar.gz"))))
|
(file-name (string-append name "-" version ".tar.gz"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
|
@ -160,7 +161,8 @@ implementation with gogdl and Amazon Games using Nile.")
|
||||||
(home-page "https://store.steampowered.com")
|
(home-page "https://store.steampowered.com")
|
||||||
(synopsis "Digital distribution platform for managing and playing games")
|
(synopsis "Digital distribution platform for managing and playing games")
|
||||||
(description "Steam is a digital software distribution platform created by Valve.")
|
(description "Steam is a digital software distribution platform created by Valve.")
|
||||||
(license (license:nonfree "file:///share/doc/steam/steam_subscriber_agreement.txt"))))
|
(license (license:nonfree "file:///share/doc/steam/steam_subscriber_agreement.txt"))
|
||||||
|
(supported-systems '("x86_64-linux"))))
|
||||||
|
|
||||||
(define steam-client-libs
|
(define steam-client-libs
|
||||||
`(("at-spi2-core" ,at-spi2-core) ; Required (often) for SteamVR interface.
|
`(("at-spi2-core" ,at-spi2-core) ; Required (often) for SteamVR interface.
|
||||||
|
|
|
@ -361,14 +361,14 @@ stable, responsive and smooth desktop experience.")))
|
||||||
(define-public linux-firmware
|
(define-public linux-firmware
|
||||||
(package
|
(package
|
||||||
(name "linux-firmware")
|
(name "linux-firmware")
|
||||||
(version "20250808")
|
(version "20250917")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://kernel.org/linux/kernel/firmware/"
|
(uri (string-append "mirror://kernel.org/linux/kernel/firmware/"
|
||||||
"linux-firmware-" version ".tar.xz"))
|
"linux-firmware-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0zw3vsmd07yr27y5fz0m357hci00ah5impx5sz4jcnd18ldmaaf0"))))
|
"0xgvb0fb4s48423asdb1dnkjjskbfmm336gm6vki2nliasvpa18j"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list #:tests? #f
|
(list #:tests? #f
|
||||||
|
@ -415,8 +415,11 @@ if your hardware is supported by one of the smaller firmware packages.")
|
||||||
#~(lambda _
|
#~(lambda _
|
||||||
(use-modules (ice-9 regex))
|
(use-modules (ice-9 regex))
|
||||||
(substitute* "WHENCE"
|
(substitute* "WHENCE"
|
||||||
(("^(File|RawFile|Link): *([^ ]*)(.*)" _ type file rest)
|
(("^(File|RawFile): *([^ ]*)(.*)" _ type file rest)
|
||||||
(string-append (if (string-match #$keep file) type "Skip") ": " file rest)))))
|
(string-append (if (string-match #$keep file) type "Skip") ": " file rest))
|
||||||
|
(("^Link: *(.*) *-> *(.*)" _ file target)
|
||||||
|
(string-append (if (string-match #$keep target) "Link" "Skip")
|
||||||
|
": " file " -> " target)))))
|
||||||
|
|
||||||
(define-public amdgpu-firmware
|
(define-public amdgpu-firmware
|
||||||
(package
|
(package
|
||||||
|
@ -705,7 +708,7 @@ laptops).")
|
||||||
((#:phases phases #~%standard-phases)
|
((#:phases phases #~%standard-phases)
|
||||||
#~(modify-phases #$phases
|
#~(modify-phases #$phases
|
||||||
(add-after 'unpack 'select-firmware
|
(add-after 'unpack 'select-firmware
|
||||||
#$(select-firmware "^iwlwifi-")))))))
|
#$(select-firmware "^intel/iwlwifi/")))))))
|
||||||
(home-page "https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi")
|
(home-page "https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi")
|
||||||
(synopsis "Nonfree firmware for Intel wifi chips")
|
(synopsis "Nonfree firmware for Intel wifi chips")
|
||||||
(description "The proprietary iwlwifi kernel module is required by many
|
(description "The proprietary iwlwifi kernel module is required by many
|
||||||
|
|
|
@ -83,7 +83,7 @@ its core.")
|
||||||
(define-public signal-desktop
|
(define-public signal-desktop
|
||||||
(package
|
(package
|
||||||
(name "signal-desktop")
|
(name "signal-desktop")
|
||||||
(version "7.70.0")
|
(version "7.71.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -92,7 +92,7 @@ its core.")
|
||||||
"https://updates.signal.org/desktop/apt/pool/s/" name "/" name "_" version
|
"https://updates.signal.org/desktop/apt/pool/s/" name "/" name "_" version
|
||||||
"_amd64.deb"))
|
"_amd64.deb"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1f3vgfyb53c1qbvcmhmmbwz4iychdvbiyrpa2rgnzr3jp5ax8dhp"))))
|
(base32 "14lk8s040alj2lxqw30hh54l4p3kpq1mxq64l8sqlph2y9c3hig3"))))
|
||||||
(supported-systems '("x86_64-linux"))
|
(supported-systems '("x86_64-linux"))
|
||||||
(build-system chromium-binary-build-system)
|
(build-system chromium-binary-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
|
|
|
@ -228,9 +228,9 @@ ACTION==\"unbind\", SUBSYSTEM==\"pci\", ATTR{vendor}==\"0x10de\", ATTR{class}==\
|
||||||
(define-public nvidia-driver
|
(define-public nvidia-driver
|
||||||
(package
|
(package
|
||||||
(name "nvidia-driver")
|
(name "nvidia-driver")
|
||||||
(version "570.181")
|
(version "580.82.09")
|
||||||
(source (nvidia-source
|
(source (nvidia-source
|
||||||
version "1yfwwfwbl5ph7s7zddixa0w8nb1wdg25sjysg98fl0hq7z72avgh"))
|
version "1dwmardvxb2w6mx7hich5wc06f50qz92jk63kbhf059fv8rgiv1y"))
|
||||||
(build-system copy-build-system)
|
(build-system copy-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list #:modules '((guix build copy-build-system)
|
(list #:modules '((guix build copy-build-system)
|
||||||
|
@ -245,8 +245,8 @@ ACTION==\"unbind\", SUBSYSTEM==\"pci\", ATTR{vendor}==\"0x10de\", ATTR{class}==\
|
||||||
("x86_64-linux" ".")
|
("x86_64-linux" ".")
|
||||||
(_ "."))
|
(_ "."))
|
||||||
"lib/" #:include-regexp ("^./[^/]+\\.so"))
|
"lib/" #:include-regexp ("^./[^/]+\\.so"))
|
||||||
("." "lib/nvidia/wine/" #:include-regexp ("_?nvngx\\.dll$"))
|
("." "lib/nvidia/wine/" #:include-regexp ("_?nvngx.*?\\.dll$"))
|
||||||
("." "share/nvidia/" #:include-regexp ("nvidia-application-profiles"))
|
("." "share/nvidia/" #:include-regexp ("nvidia-application-profiles|nvoptix.bin"))
|
||||||
("." "share/egl/egl_external_platform.d/" #:include-regexp ("(gbm|wayland|xcb|xlib)\\.json"))
|
("." "share/egl/egl_external_platform.d/" #:include-regexp ("(gbm|wayland|xcb|xlib)\\.json"))
|
||||||
("10_nvidia.json" "share/glvnd/egl_vendor.d/")
|
("10_nvidia.json" "share/glvnd/egl_vendor.d/")
|
||||||
("90-nvidia.rules" "lib/udev/rules.d/")
|
("90-nvidia.rules" "lib/udev/rules.d/")
|
||||||
|
@ -287,6 +287,8 @@ ACTION==\"unbind\", SUBSYSTEM==\"pci\", ATTR{vendor}==\"0x10de\", ATTR{class}==\
|
||||||
(substitute* '("nvidia_icd.json"
|
(substitute* '("nvidia_icd.json"
|
||||||
"nvidia_layers.json")
|
"nvidia_layers.json")
|
||||||
(("libGLX_nvidia\\.so\\.." all)
|
(("libGLX_nvidia\\.so\\.." all)
|
||||||
|
(string-append #$output "/lib/" all))
|
||||||
|
(("libnvidia-present\\.so\\.[0-9.]*" all)
|
||||||
(string-append #$output "/lib/" all)))
|
(string-append #$output "/lib/" all)))
|
||||||
|
|
||||||
;; VulkanSC ICD configuration
|
;; VulkanSC ICD configuration
|
||||||
|
@ -627,9 +629,9 @@ add @code{nvidia_drm.modeset=0} to @code{kernel-arguments} as well.")
|
||||||
(define-public nvidia-settings
|
(define-public nvidia-settings
|
||||||
(package
|
(package
|
||||||
(name "nvidia-settings")
|
(name "nvidia-settings")
|
||||||
(version "570.181")
|
(version "580.82.09")
|
||||||
(source (nvidia-settings-source
|
(source (nvidia-settings-source
|
||||||
name version "0fq72pj1b4iwlyivi9nmqr45iz6aqqdxgdbgk26x9m1yfxgpy748"))
|
name version "0sy3mrg3vmyba6m87nanzmpvv2hzhb6nqdckhlaxv8wppmr7fvms"))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list #:tests? #f ;no test suite
|
(list #:tests? #f ;no test suite
|
||||||
|
@ -849,7 +851,7 @@ variables @code{__GLX_VENDOR_LIBRARY_NAME=nvidia} and
|
||||||
(define-public egl-gbm
|
(define-public egl-gbm
|
||||||
(package
|
(package
|
||||||
(name "egl-gbm")
|
(name "egl-gbm")
|
||||||
(version "1.1.2")
|
(version "1.1.2.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
|
@ -858,7 +860,7 @@ variables @code{__GLX_VENDOR_LIBRARY_NAME=nvidia} and
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1rfgfi06ry7c7hnzdm4b0dc8r3hmbfn2rd37z3mc4wn38sgz5l3a"))))
|
"1zcr1jksnh0431marzvgg301aybli29r1xw5vs4wnxgcp9bigvn6"))))
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(native-inputs (list pkg-config))
|
(native-inputs (list pkg-config))
|
||||||
(inputs (list eglexternalplatform mesa-for-nvda))
|
(inputs (list eglexternalplatform mesa-for-nvda))
|
||||||
|
@ -872,7 +874,7 @@ GBM EGL support.")
|
||||||
(define-public egl-x11
|
(define-public egl-x11
|
||||||
(package
|
(package
|
||||||
(name "egl-x11")
|
(name "egl-x11")
|
||||||
(version "1.0.2")
|
(version "1.0.3")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
|
@ -881,7 +883,7 @@ GBM EGL support.")
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0s18xpylz16ry51xp1bs2s4hmvwsq49hcfc0gnmmvnymdzm041aq"))))
|
"1hh1wkdijjhsmym5ab5nw8wyi0w9x7aznnmyg8sczhwdfb5rdnrj"))))
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(native-inputs (list pkg-config))
|
(native-inputs (list pkg-config))
|
||||||
(inputs (list eglexternalplatform mesa-for-nvda))
|
(inputs (list eglexternalplatform mesa-for-nvda))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue