summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nongnu/packages/chrome.scm6
-rw-r--r--nongnu/packages/editors.scm35
-rw-r--r--nongnu/packages/electron.scm4
-rw-r--r--nongnu/packages/game-client.scm4
-rw-r--r--nongnu/packages/linux.scm31
-rw-r--r--nongnu/packages/mozilla.scm12
-rw-r--r--nongnu/packages/music.scm8
-rw-r--r--nongnu/packages/video.scm74
8 files changed, 127 insertions, 47 deletions
diff --git a/nongnu/packages/chrome.scm b/nongnu/packages/chrome.scm
index d3bc509..0a7b7d4 100644
--- a/nongnu/packages/chrome.scm
+++ b/nongnu/packages/chrome.scm
@@ -143,10 +143,10 @@
(license (nonfree "https://www.google.com/intl/en/chrome/terms/")))))
(define-public google-chrome-stable
- (make-google-chrome "stable" "123.0.6312.86" "1fjpwz5pdzjak7932kxvmp3ba2s5qyvj5b908sndg9l4qv1hkh96"))
+ (make-google-chrome "stable" "125.0.6422.76" "0msccf0x9dgplm3r7llra7xk08f0an1r5v1fi5m5pmzilk0q9cc4"))
(define-public google-chrome-beta
- (make-google-chrome "beta" "124.0.6367.18" "18gv6s4v6g8nw80rfiamz0xx6bwzn567xvmmn95xx70lhcvz9s34"))
+ (make-google-chrome "beta" "126.0.6478.17" "01dkji4wlh26srjxi83k7y8pkplm3l7cl76vnnvhh0v6m3cqvcqj"))
(define-public google-chrome-unstable
- (make-google-chrome "unstable" "125.0.6368.2" "0cfsq2qh9apbafapxqdz8sb65mm6yqxpcl7kwx9g9yi0sngqcxsz"))
+ (make-google-chrome "unstable" "127.0.6485.0" "1bm5mmdnkb8rs3na0kwxdx2hx4wm5m9qdnzhs1ds9ass2363ybib"))
diff --git a/nongnu/packages/editors.scm b/nongnu/packages/editors.scm
index d07bf1d..114fe85 100644
--- a/nongnu/packages/editors.scm
+++ b/nongnu/packages/editors.scm
@@ -1,5 +1,5 @@
;;; SPDX-License-Identifier: GPL-3.0-or-later
-;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2023, 2024 Giacomo Leidi <goodoldpaul@autistici.org>
(define-module (nongnu packages editors)
#:use-module (gnu packages base)
@@ -14,20 +14,27 @@
(define-public vscodium
(package
(name "vscodium")
- (version "1.87.0.24060")
+ (version "1.88.1.24104")
(source
- (origin
- (method url-fetch)
- (uri
- (let ((arch (match (or (%current-target-system) (%current-system))
- ("aarch64-linux" "arm64")
- ("armhf-linux" "armhf")
- (_ "x64"))))
- (string-append
- "https://github.com/VSCodium/vscodium/releases/download/" version
- "/VSCodium-linux-" arch "-" version ".tar.gz")))
- (sha256
- (base32 "1lw7j8h0i96mg8si8dmi55ldbz5j63zb93qf1g59siavx84f1zpd"))))
+ (let ((arch (match (or (%current-target-system) (%current-system))
+ ("aarch64-linux" "arm64")
+ ("armhf-linux" "armhf")
+ (_ "x64")))
+ (hash (match (or (%current-target-system) (%current-system))
+ ("aarch64-linux"
+ "0412222l9r81f3aa3zlzrg42hzslvvck5kds7zrmpssjrd41jxfh")
+ ("armhf-linux"
+ "1sblaigrxscx4l1kln1zxzm5da5lr50y1k6qb4igq6wxbdx55iay")
+ (_
+ "1n3gb12asid2qwwzf9fj974ws9n7has9l23ni8jscx9cp63l5rbl"))))
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append
+ "https://github.com/VSCodium/vscodium/releases/download/" version
+ "/VSCodium-linux-" arch "-" version ".tar.gz"))
+ (sha256
+ (base32 hash)))))
(build-system chromium-binary-build-system)
(arguments
(list #:validate-runpath? #f ; TODO: fails on wrapped binary and included other files
diff --git a/nongnu/packages/electron.scm b/nongnu/packages/electron.scm
index a4a7b67..1df028c 100644
--- a/nongnu/packages/electron.scm
+++ b/nongnu/packages/electron.scm
@@ -26,7 +26,9 @@
("x86_64-linux" "linux-x64")
("i686-linux" "linux-ia32")
("aarch64-linux" "linux-arm64")
- ("armhf-linux" "linux-armv7l"))
+ ("armhf-linux" "linux-armv7l")
+ ;; We need a default case
+ (_ "unsupported"))
".zip"))
(sha256 (base32 hash))))
diff --git a/nongnu/packages/game-client.scm b/nongnu/packages/game-client.scm
index d9843ee..3b04b9c 100644
--- a/nongnu/packages/game-client.scm
+++ b/nongnu/packages/game-client.scm
@@ -58,7 +58,7 @@
(define heroic-client
(package
(name "heroic-client")
- (version "2.12.0")
+ (version "2.14.1")
(source
(origin
(method url-fetch)
@@ -67,7 +67,7 @@
version "/heroic_" version "_amd64.deb"))
(sha256
(base32
- "0ikb9r72n7xknns81mibipfwqh0r9hqnm5a3k4xsk8my1gajc60c"))))
+ "17q8cylhyp48qmjrn6jx0fvpp84q4lb9qvgc99c9y7m31xp897nw"))))
(build-system chromium-binary-build-system)
(arguments
(list #:validate-runpath? #f ; TODO: fails on wrapped binary and included other files
diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm
index a18ed7e..ede036f 100644
--- a/nongnu/packages/linux.scm
+++ b/nongnu/packages/linux.scm
@@ -133,6 +133,9 @@ some freedo package or an output of package-version procedure."
"The unmodified Linux kernel, including nonfree blobs, for running Guix System
on hardware which requires nonfree software to function."))))
+(define-public linux-6.9
+ (corrupt-linux linux-libre-6.9))
+
(define-public linux-6.8
(corrupt-linux linux-libre-6.8))
@@ -154,7 +157,7 @@ on hardware which requires nonfree software to function."))))
(define-public linux-4.19
(corrupt-linux linux-libre-4.19))
-(define-public linux linux-6.8)
+(define-public linux linux-6.9)
;; linux-lts points to the *newest* released long-term support version.
(define-public linux-lts linux-6.6)
@@ -216,7 +219,7 @@ on hardware which requires nonfree software to function."))))
(xanmod-defconfig "config_x86-64-v1"))
(define %default-extra-linux-options
- (@@ (gnu packages linux) %default-extra-linux-options))
+ ((@@ (gnu packages linux) default-extra-linux-options) version))
(define config->string
(@@ (gnu packages linux) config->string))
@@ -276,17 +279,17 @@ distribution with custom settings and new features. It's built to provide a
stable, responsive and smooth desktop experience.")))
;; Linux-XanMod sources
-(define-public linux-xanmod-version "6.8.6")
+(define-public linux-xanmod-version "6.9.3")
(define-public linux-xanmod-revision "xanmod1")
(define-public linux-xanmod-source
(make-linux-xanmod-source
linux-xanmod-version
linux-xanmod-revision
#:xanmod-branch "main"
- #:kernel-hash (base32 "1wv5x7qhcd05m8m0myyqm2il6mha1sx11h7ppf8yjsxvx2jdwsf9")
- #:xanmod-hash (base32 "1ry4qmsis7s2bb6hpkvq30ffgvhzj1w33js67ybnvagzda5vbmci")))
+ #:kernel-hash (base32 "0jc14s7z2581qgd82lww25p7c4w72scpf49z8ll3wylwk3xh3yi4")
+ #:xanmod-hash (base32 "100xmh3v3gskdg5ak18r00ka8drjg4vq7n4h7h2d06ibp8r0vhcn")))
-(define-public linux-xanmod-lts-version "6.6.27")
+(define-public linux-xanmod-lts-version "6.6.32")
(define-public linux-xanmod-lts-revision "xanmod1")
(define-public linux-xanmod-lts-source
(make-linux-xanmod-source
@@ -294,7 +297,7 @@ stable, responsive and smooth desktop experience.")))
linux-xanmod-lts-revision
#:xanmod-branch "lts"
#:kernel-hash (base32 "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr")
- #:xanmod-hash (base32 "0inlpdscdpqahwlsf8kc2zjp2p83yr2cfqyaxld6m4bjkbg23lvz")))
+ #:xanmod-hash (base32 "16kwzz0k9y9jvzrcrn4l5p647xxxla0jhdf2mrwgrz32zg90ndap")))
;; Linux-XanMod packages
(define-public linux-xanmod
@@ -315,14 +318,14 @@ stable, responsive and smooth desktop experience.")))
(define-public linux-firmware
(package
(name "linux-firmware")
- (version "20240312")
+ (version "20240513")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/linux/kernel/firmware/"
"linux-firmware-" version ".tar.xz"))
(sha256
(base32
- "152bpl3lzd7jb2z1cl1sfax6jm71bspn7bwc00lci5qqmma7lcmj"))))
+ "0knc7qgk4bkcdip0hvjnwk4jv062m8cdskywrqvms4v8jswys1cz"))))
(build-system gnu-build-system)
(arguments
(list #:tests? #f
@@ -805,8 +808,8 @@ network adapters.")
(license gpl2))))
(define-public rtl8821ce-linux-module
- (let ((commit "66983b69120a13699acf40a12979317f29012111")
- (revision "11"))
+ (let ((commit "f119398d868b1a3395f40c1df2e08b57b2c882cd")
+ (revision "12"))
(package
(name "rtl8821ce-linux-module")
(version (git-version "0.0.0" revision commit))
@@ -819,7 +822,7 @@ network adapters.")
(file-name (git-file-name name version))
(sha256
(base32
- "0kj12jll0df1h4z6kzv3vylh22xlniki5kg414fv9sqgx1qgs5k7"))))
+ "03336fzhcyfkxa32rx0calzlyzamvinql5f19wwm61aijrmlmyhi"))))
(build-system linux-module-build-system)
(arguments
(list #:make-flags
@@ -1184,7 +1187,7 @@ driver:
(define-public intel-microcode
(package
(name "intel-microcode")
- (version "20240312")
+ (version "20240531")
(source
(origin
(method git-fetch)
@@ -1195,7 +1198,7 @@ driver:
(commit (string-append "microcode-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1j1krkmp9kxmpq8bbbld8bm3y9rqhmlj5qfm43czikawnpw81571"))))
+ (base32 "1r9l42qsz2rj0zcknvj37q595xcbmisqf10f8rwjb2nlrl8xr2zb"))))
(build-system copy-build-system)
(arguments
(list #:install-plan
diff --git a/nongnu/packages/mozilla.scm b/nongnu/packages/mozilla.scm
index 7a51866..529342d 100644
--- a/nongnu/packages/mozilla.scm
+++ b/nongnu/packages/mozilla.scm
@@ -97,19 +97,19 @@
;; Update this id with every firefox update to its release date.
;; It's used for cache validation and therefore can lead to strange bugs.
-(define %firefox-esr-build-id "20240415130026")
+(define %firefox-esr-build-id "20240610131531")
(define-public firefox-esr
(package
(name "firefox-esr")
- (version "115.10.0esr")
+ (version "115.12.0esr")
(source
(origin
(method url-fetch)
(uri (string-append "https://archive.mozilla.org/pub/firefox/releases/"
version "/source/firefox-" version ".source.tar.xz"))
(sha256
- (base32 "1wpf4vcrvnvhnfzqavbkzqbn51bds1l9f6ld4mzh9xwm7mrkrz8a"))))
+ (base32 "1vx88wc10fjkvqdqf3ab65qk3km7z0mlyf9plxjhabxvl0jid7mm"))))
(build-system gnu-build-system)
(arguments
(list
@@ -532,20 +532,20 @@ MOZ_ENABLE_WAYLAND=1 exec ~a $@\n"
;; Update this id with every firefox update to its release date.
;; It's used for cache validation and therefore can lead to strange bugs.
-(define %firefox-build-id "20240422125740")
+(define %firefox-build-id "20240527195430")
(define-public firefox
(package
(inherit firefox-esr)
(name "firefox")
- (version "125.0.2")
+ (version "126.0.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://archive.mozilla.org/pub/firefox/releases/"
version "/source/firefox-" version ".source.tar.xz"))
(sha256
- (base32 "16gpd6n52lshvkkha41z7xicggj64dw0qhr5gd07bcxsc4rmdl39"))))
+ (base32 "0fr679rcwshwpfxidc55b2xsn4pmrr7p9ix4rr2mv2k7kwsjcc7n"))))
(arguments
(substitute-keyword-arguments (package-arguments firefox-esr)
((#:phases phases)
diff --git a/nongnu/packages/music.scm b/nongnu/packages/music.scm
index dffd758..37df582 100644
--- a/nongnu/packages/music.scm
+++ b/nongnu/packages/music.scm
@@ -34,7 +34,9 @@
("x86_64-linux" "linux_x86_64")
("i686-linux" "linux_i686")
("aarch64-linux" "linux_aarch64")
- ("armhf-linux" "linux_armv7l"))
+ ("armhf-linux" "linux_armv7l")
+ ;; We need a default case
+ (_ "unsupported"))
".tar.xz"))
(sha256
(base32
@@ -42,7 +44,9 @@
("x86_64-linux" "1hd7fbk0px45fxhqa7nqcnij8ls2fhpjp60v840vy2zqs9fkcr52")
("i686-linux" "11vk32mxyda9xl08pp2ivd1vsahnw6w7d08in4syz6iannfwp19b")
("aarch64-linux" "0zpkaiwwxn8yh3s1d22qswshbgaxx5d8iy17hb3w256zgb722yjw")
- ("armhf-linux" "18174b1lgsk73gxhala471ppzbrpa1cs953b5par998yqgh74znk"))))))
+ ("armhf-linux" "18174b1lgsk73gxhala471ppzbrpa1cs953b5par998yqgh74znk")
+ ;; We need a valid base32 default case
+ (_ "0000000000000000000000000000000000000000000000000000"))))))
(build-system binary-build-system)
(arguments
(list #:strip-binaries? #f ;allocated section `.dynsym' not in segment
diff --git a/nongnu/packages/video.scm b/nongnu/packages/video.scm
index 4c6a4b0..e5af3a1 100644
--- a/nongnu/packages/video.scm
+++ b/nongnu/packages/video.scm
@@ -1,5 +1,6 @@
;;; SPDX-License-Identifier: GPL-3.0-or-later
;;; Copyright © 2022 Jelle Licht <jlicht@fsfe.org>
+;;; Copyright © 2024 Oleg Pykhalov <go.wigust@gmail.com>
(define-module (nongnu packages video)
#:use-module (gnu packages pkg-config)
@@ -10,12 +11,13 @@
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix utils)
- #:use-module ((guix licenses) #:prefix license:))
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (nongnu packages chromium))
(define-public gmmlib
(package
(name "gmmlib")
- (version "22.3.15")
+ (version "22.3.19")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -24,7 +26,7 @@
(file-name (git-file-name name version))
(sha256
(base32
- "0qmdprqarqdz8z6s1av2vmd7ma5yaswxkxzdjci57fgyylqkjlri"))))
+ "0p3wp6xcvpb4jzw4fsf6554qy91iblmq9y50ph3iy29m19q6nznb"))))
(build-system cmake-build-system)
(arguments
;; Tests are run as part of the normal build step
@@ -40,7 +42,7 @@ for VAAPI.")
(define-public intel-media-driver
(package
(name "intel-media-driver")
- (version "23.4.3")
+ (version "24.1.5")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -49,7 +51,7 @@ for VAAPI.")
(file-name (git-file-name name version))
(sha256
(base32
- "0rgjakygfzy6d3jz38nnjvcvqyjnwz2b4vfh1ifqfcm3bw56fmr9"))))
+ "1jm4imld48scj0j499wq5zbdjv4gg7hg2sawljqnjvy09dmp09bs"))))
(build-system cmake-build-system)
(inputs (list libva gmmlib))
(native-inputs (list pkg-config))
@@ -92,3 +94,65 @@ graphics hardware.")
(package-description intel-media-driver)
" This build of intel-media-driver includes nonfree blobs to fully enable the
video decode capabilities of supported Intel GPUs."))))
+
+(define-public obs-with-cef
+ (package
+ (inherit obs)
+ (name "obs-with-cef")
+ (inputs
+ (append (package-inputs obs)
+ `(("chromium-embedded-framework" ,chromium-embedded-framework))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments obs)
+ ((#:configure-flags flags)
+ #~(append #$flags
+ '("-DBUILD_BROWSER=ON"
+ "-DCEF_ROOT_DIR=../source/cef")))
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-before 'configure 'add-cef
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((chromium-embedded-framework
+ #$(this-package-input "chromium-embedded-framework")))
+ (mkdir-p "cef/Release")
+ (mkdir-p "cef/Resources")
+ (for-each (lambda (file)
+ (symlink file (string-append "cef/Release/"
+ (basename file)))
+ (symlink file (string-append "cef/Resources/"
+ (basename file))))
+ (filter
+ (lambda (file)
+ (not (string= (basename (dirname file))
+ "locales")))
+ (find-files
+ (string-append chromium-embedded-framework
+ "/share/cef"))))
+ (symlink (string-append chromium-embedded-framework
+ "/lib/libcef.so")
+ "cef/Release/libcef.so")
+ (mkdir-p "cef/libcef_dll_wrapper")
+ (symlink (string-append chromium-embedded-framework
+ "/lib/libcef_dll_wrapper.a")
+ "cef/libcef_dll_wrapper/libcef_dll_wrapper.a")
+ (symlink (string-append chromium-embedded-framework
+ "/include")
+ "cef/include"))))
+ (add-after 'install 'symlink-obs-browser
+ ;; Required for lib/obs-plugins/obs-browser.so file.
+ (lambda* (#:key outputs #:allow-other-keys)
+ (symlink
+ (string-append #$output
+ "/lib/libobs-frontend-api.so.0")
+ (string-append #$output
+ "/lib/obs-plugins/libobs-frontend-api.so.0"))
+ (symlink
+ (string-append #$output
+ "/lib/libobs.so.0")
+ (string-append #$output
+ "/lib/obs-plugins/libobs.so.0"))))))))
+ (description
+ (string-append
+ (package-description obs)
+ " This build of OBS includes embeded Chromium-based browser to enable
+Browser source."))))
generated by cgit v1.2.3 (git 2.44.0) at 2024-06-13 10:47:20 +0000