mirror of
https://gitlab.com/nonguix/nonguix.git
synced 2025-10-02 02:14:59 +00:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
arkhan
commit
2fca3e2ec7
16 changed files with 648 additions and 77 deletions
|
|
@ -92,8 +92,23 @@
|
|||
((old-exe) exe))
|
||||
(substitute* (string-append usr/share "/menu/google-" #$appname ".menu")
|
||||
(("/opt") share)
|
||||
((old-exe) exe))
|
||||
#t)))
|
||||
((old-exe) exe)))))
|
||||
(add-after 'install 'install-icons
|
||||
(lambda _
|
||||
(define (format-icon-size name)
|
||||
(car
|
||||
(string-split
|
||||
(string-drop-right (string-drop name 13) 4)
|
||||
#\_)))
|
||||
(let ((icons (string-append #$output "/share/icons/hicolor"))
|
||||
(share (string-append #$output "/share/google/" #$appname)))
|
||||
(for-each (lambda (icon)
|
||||
(let* ((icon-name (basename icon))
|
||||
(icon-size (format-icon-size icon-name))
|
||||
(target (string-append icons "/" icon-size "x" icon-size "/apps/google-" #$appname ".png")))
|
||||
(mkdir-p (dirname target))
|
||||
(rename-file icon target)))
|
||||
(find-files share "product_logo_.*\\.png")))))
|
||||
(add-before 'install-wrapper 'install-exe
|
||||
(lambda _
|
||||
(let* ((bin (string-append #$output "/bin"))
|
||||
|
|
@ -131,10 +146,10 @@
|
|||
(license (nonfree "https://www.google.com/intl/en/chrome/terms/")))))
|
||||
|
||||
(define-public google-chrome-stable
|
||||
(make-google-chrome "stable" "114.0.5735.106" "1zlw9gjb2fmjf1d952adqg07cyq60yck0aarz20lcvv2jzb7s46i"))
|
||||
(make-google-chrome "stable" "118.0.5993.70" "1bq170l0g9yq17x6xlg6fjar6gv3hdi0zijwmx4s02pmw6727484"))
|
||||
|
||||
(define-public google-chrome-beta
|
||||
(make-google-chrome "beta" "115.0.5790.13" "11v374p82k8xbak37c377km9y2hvy8avw6mjl9az5kzb2am3g566"))
|
||||
(make-google-chrome "beta" "117.0.5938.22" "11w1di146mjb9ql30df9yk9x4b9amc6514jzyfbf09mqsrw88dvr"))
|
||||
|
||||
(define-public google-chrome-unstable
|
||||
(make-google-chrome "unstable" "116.0.5803.2" "0qgp0m67bpaali7w6bxy1jzw0aig4iiqqgg023k1q32712s192cs"))
|
||||
(make-google-chrome "unstable" "119.0.6034.6" "156rsklyi1z014pyximwyjsnc2rhdky1kck9g63738vnhcv398b0"))
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
(define-public vscodium
|
||||
(package
|
||||
(name "vscodium")
|
||||
(version "1.78.2.23132")
|
||||
(version "1.81.1.23222")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
"https://github.com/VSCodium/vscodium/releases/download/" version
|
||||
"/VSCodium-linux-x64-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0ymgy0xisfxqrrmwpy0ga2rhlzhxqq39ppjfawxaf0dfdnkhgkgr"))))
|
||||
(base32 "0wx53ajjwil82s3nl6wvpdf01mh33yqasf1ia54s1rfzz10fa1m6"))))
|
||||
(build-system chromium-binary-build-system)
|
||||
(arguments
|
||||
(list #:validate-runpath? #f ; TODO: fails on wrapped binary and included other files
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
(define-public electron
|
||||
(package
|
||||
(name "electron")
|
||||
(version "24.2.0")
|
||||
(version "25.3.1")
|
||||
(source (origin
|
||||
(method url-fetch/zipbomb)
|
||||
(uri
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
("aarch64-linux" "linux-arm64")
|
||||
("armhf-linux" "linux-armv7l"))
|
||||
".zip"))
|
||||
(sha256 (base32 "04vmqr5547059751yxr729ljqahal57lymyglaa5xzpw5bfq0xwd"))))
|
||||
(sha256 (base32 "0x6asi81gwxx33mhpm74l31xzf1lbzbf7s97fay0l35fg73kkw9n"))))
|
||||
(build-system chromium-binary-build-system)
|
||||
(arguments
|
||||
`(#:wrapper-plan
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
;;; SPDX-License-Identifier: GPL-3.0-or-later
|
||||
;;; Copyright © 2021 Korytov Pavel <thexcloud@gmail.com>
|
||||
;;; Copyright © 2021 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
||||
;;; Copyright © 2023 Krzysztof Baranowski <pharcosyle@gmail.com>
|
||||
|
||||
(define-module (nongnu packages fonts)
|
||||
#:use-module (ice-9 string-fun)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (guix deprecation)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix build-system font)
|
||||
#:use-module (guix build-system copy)
|
||||
|
|
@ -163,3 +165,163 @@ Included fonts:
|
|||
("font-microsoft-trebuchet-ms" ,font-microsoft-trebuchet-ms)
|
||||
("font-microsoft-verdana" ,font-microsoft-verdana)
|
||||
("font-microsoft-webdings" ,font-microsoft-webdings)))))
|
||||
|
||||
(define* (apple-font #:key
|
||||
font-name
|
||||
archive-timestamp
|
||||
version
|
||||
file
|
||||
hash
|
||||
synopsis
|
||||
description)
|
||||
(package
|
||||
(name (string-append "font-apple-"
|
||||
(string-replace-substring
|
||||
(string-downcase font-name)
|
||||
" " "-")))
|
||||
(version version)
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
;; Download link is unversioned, use a stable snapshot.
|
||||
"https://web.archive.org/web/" archive-timestamp "/"
|
||||
"https://devimages-cdn.apple.com/design/resources/download/"
|
||||
file ".dmg"))
|
||||
(sha256
|
||||
(base32 hash))))
|
||||
(build-system font-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'unpack
|
||||
(lambda* (#:key source inputs #:allow-other-keys)
|
||||
(let ((7z-exe (search-input-file inputs "/bin/7z")))
|
||||
(invoke 7z-exe "x" source)
|
||||
(invoke 7z-exe "x" (car (find-files "." "\\.pkg$")))
|
||||
(invoke 7z-exe "x" "Payload~")))))))
|
||||
(native-inputs (list p7zip))
|
||||
(home-page "https://developer.apple.com/fonts")
|
||||
(synopsis (string-append font-name " typeface by Apple."))
|
||||
(description description)
|
||||
(license
|
||||
(nonfree
|
||||
"https://www.apple.com"
|
||||
"Specific license information is embedded in the font files."))))
|
||||
|
||||
(define-public font-apple-sf-pro
|
||||
(apple-font
|
||||
#:font-name "SF Pro"
|
||||
#:archive-timestamp "20230710073336"
|
||||
#:file "SF-Pro"
|
||||
#:version "19.0d6e1"
|
||||
#:hash "19qa6fs6x5614sqw9a6idlizzsssw8256crz1ps2p2n6gwp2fvaq"
|
||||
#:description "This neutral, flexible, sans-serif typeface is the system
|
||||
font for iOS, iPad OS, macOS and tvOS. SF Pro features nine weights, variable
|
||||
optical sizes for optimal legibility, four widths, and includes a rounded
|
||||
variant. SF Pro supports over 150 languages across Latin, Greek, and Cyrillic
|
||||
scripts."))
|
||||
|
||||
(define-public font-apple-sf-compact
|
||||
(apple-font
|
||||
#:font-name "SF Compact"
|
||||
#:archive-timestamp "20230710073418"
|
||||
#:file "SF-Compact"
|
||||
#:version "19.0d6e1"
|
||||
#:hash "02127drlqvwscq6vaphmvsp85cn8j4zfhi0kb9a3fzc0z8b95hdq"
|
||||
#:description "Sharing many features with SF Pro, SF Compact features an
|
||||
efficient, compact design that is optimized for small sizes and narrow columns.
|
||||
SF Compact is the system font for watchOS and includes a rounded variant."))
|
||||
|
||||
(define-public font-apple-sf-mono
|
||||
(apple-font
|
||||
#:font-name "SF Mono"
|
||||
#:archive-timestamp "20230710073457"
|
||||
#:file "SF-Mono"
|
||||
#:version "19.0d6e1"
|
||||
#:hash "0vjdpl3xyxl2rmfrnjsxpxdizpdr4canqa1nm63s5d3djs01iad6"
|
||||
#:description "This monospaced variant of San Francisco enables alignment
|
||||
between rows and columns of text, and is used in coding environments like Xcode.
|
||||
SF Mono features six weights and supports Latin, Greek, and Cyrillic scripts."))
|
||||
|
||||
(define-public font-apple-sf-arabic
|
||||
(apple-font
|
||||
#:font-name "SF Arabic"
|
||||
#:archive-timestamp "20230710073501"
|
||||
#:file "SF-Arabic"
|
||||
#:version "19.0d6e1"
|
||||
#:hash "0phl3wi0lq7djcg8nqg1ml1f73bsfjzmvd2n8hkl6dbprmw614jp"
|
||||
#:description "A contemporary interpretation of the Naskh style with a
|
||||
rational and flexible design, this extension of San Francisco is the Arabic
|
||||
system font on Apple platforms. Like San Francisco, SF Arabic features nine
|
||||
weights, variable optical sizes that automatically adjust spacing and contrast
|
||||
based on the point size, and includes a rounded variant."))
|
||||
|
||||
(define-public font-apple-new-york
|
||||
(apple-font
|
||||
#:font-name "New York"
|
||||
#:archive-timestamp "20230710073506"
|
||||
#:file "NY"
|
||||
#:version "17.0d5e1"
|
||||
#:hash "1hgxyizpgam7y1xh36fsypd3a1nn417wdnnfk1zahq9vhxrrds2w"
|
||||
#:description "A companion to San Francisco, this serif typeface is based on
|
||||
essential aspects of historical type styles. New York features six weights,
|
||||
supports Latin, Greek and Cyrillic scripts, and features variable optical sizes
|
||||
allowing it to perform as a traditional reading face at small sizes and a
|
||||
graphic display face at larger sizes."))
|
||||
|
||||
;; At the time of this writing, `sf-symbols' is just `sf-pro' and `sf-compact'
|
||||
;; together plus one extra file, SFSymbolsFallback.otf. This package is
|
||||
;; probably of limited use on non-macOS but we'll include it for completeness
|
||||
;; and in case the situation changes in the future.
|
||||
(define-public font-apple-sf-symbols
|
||||
(apple-font
|
||||
#:font-name "SF Symbols"
|
||||
#:archive-timestamp "20230710073513"
|
||||
#:file "SF-Symbols-5"
|
||||
#:version "5"
|
||||
#:hash "1bwlq1nf75bv0x36qdk371r2pd5slf3jlv50wgsl0kpj1dds22sf"
|
||||
#:description "With over 5,000 symbols, SF Symbols is a library of
|
||||
iconography designed to integrate seamlessly with San Francisco, the system
|
||||
font for Apple platforms. Symbols come in nine weights and three scales, and
|
||||
automatically align with text labels."))
|
||||
|
||||
(define-public font-apple-color-emoji
|
||||
(package
|
||||
(name "font-apple-color-emoji")
|
||||
(version "18.0d4e1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/pharcosyle/apple-fonts"
|
||||
"/releases/download"
|
||||
"/Apple-Color-Emoji-" version "/Apple.Color.Emoji.ttc"))
|
||||
(sha256
|
||||
(base32 "06i1ady7b2g1i2hl3f8yxn64g2i82c2ni9vdw25gpdqdj28vyqw3"))))
|
||||
(build-system font-build-system)
|
||||
(home-page "https://www.apple.com")
|
||||
(synopsis "Apple Color Emoji typeface by Apple.")
|
||||
(description "Color and black-and-white Apple emoji fonts.")
|
||||
(license (nonfree "https://www.apple.com"))))
|
||||
|
||||
(define-public font-apple-symbols
|
||||
(package
|
||||
(name "font-apple-symbols")
|
||||
(version "17.0d1e2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/pharcosyle/apple-fonts"
|
||||
"/releases/download"
|
||||
"/Apple-Symbols-" version "/Apple.Symbols.ttf"))
|
||||
(sha256
|
||||
(base32 "14ivhsiszmy1ql69kpr1f33n07qgpaj7w43w2p5qnmlwcrvs3ccr"))))
|
||||
(build-system font-build-system)
|
||||
(home-page "https://www.apple.com")
|
||||
(synopsis "Apple Symbols typeface by Apple.")
|
||||
(description "An Apple system font intended to provide coverage for
|
||||
characters defined as symbols in the Unicode Standard.")
|
||||
(license (nonfree "https://www.apple.com"))))
|
||||
|
|
|
|||
217
nongnu/packages/k8s.scm
Normal file
217
nongnu/packages/k8s.scm
Normal file
|
|
@ -0,0 +1,217 @@
|
|||
;;; SPDX-License-Identifier: GPL-3.0-or-later
|
||||
;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org>
|
||||
|
||||
(define-module (nongnu packages k8s)
|
||||
#:use-module (guix build-system copy)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix packages)
|
||||
#:use-module ((guix licenses) :prefix license:))
|
||||
|
||||
(define-public k9s
|
||||
(package
|
||||
(name "k9s")
|
||||
(version "0.27.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/derailed/k9s/releases/download/v"
|
||||
version "/k9s_Linux_amd64.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"14j37kl8pbmbid4np48cfv5k8vic6ngnc4pjh01qr6szplg861z5"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:substitutable? #f
|
||||
#:install-plan
|
||||
#~'(("k9s" "bin/"))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'unpack
|
||||
(lambda _
|
||||
(invoke "tar" "-xvf" #$source))))))
|
||||
(home-page "https://k9scli.io")
|
||||
(supported-systems '("x86_64-linux"))
|
||||
(synopsis "Kubernetes CLI To Manage Your Clusters In Style")
|
||||
(description
|
||||
"K9s provides a terminal UI to interact with your Kubernetes clusters. The
|
||||
aim of this project is to make it easier to navigate, observe and manage your
|
||||
applications in the wild. K9s continually watches Kubernetes for changes and
|
||||
offers subsequent commands to interact with your observed resources.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public katenary
|
||||
(package
|
||||
(name "katenary")
|
||||
(version "2.0.0-beta2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/metal3d/katenary/releases/download/"
|
||||
version "/katenary-linux-amd64"))
|
||||
(sha256
|
||||
(base32
|
||||
"0vk5c82bf5aasrgz2b7qdjlbmlcjha0r3swmrbs9y5mms18y7m3i"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:substitutable? #f
|
||||
#:install-plan
|
||||
#~'(("katenary" "bin/"))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'unpack
|
||||
(lambda _
|
||||
(copy-file #$source "./katenary")
|
||||
(chmod "katenary" #o644)))
|
||||
(add-before 'install 'chmod
|
||||
(lambda _
|
||||
(chmod "katenary" #o555))))))
|
||||
(home-page "https://github.com/metal3d/katenary")
|
||||
(supported-systems '("x86_64-linux"))
|
||||
(synopsis "Convert docker-compose to a configurable helm chart")
|
||||
(description
|
||||
"Katenary is a tool to help to transform docker-compose files to a working
|
||||
Helm Chart for Kubernetes.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public kubectl
|
||||
(package
|
||||
(name "kubectl")
|
||||
(version "1.28.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://dl.k8s.io/release/v" version "/bin/linux/amd64/kubectl"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qbl4a2xv795apvbwahdb9kzcm2wys0am1c72as3iavgs3wxd9z7"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:substitutable? #f
|
||||
#:install-plan
|
||||
#~'(("kubectl" "bin/"))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'unpack
|
||||
(lambda _
|
||||
(copy-file #$source "./kubectl")
|
||||
(chmod "kubectl" #o644)))
|
||||
(add-before 'install 'chmod
|
||||
(lambda _
|
||||
(chmod "kubectl" #o555))))))
|
||||
(home-page "https://github.com/kubernetes/kubectl")
|
||||
(supported-systems '("x86_64-linux"))
|
||||
(synopsis "Kubernetes command line tool")
|
||||
(description
|
||||
"kubectl allows you to run commands against Kubernetes clusters. You can
|
||||
use kubectl to deploy applications, inspect and manage cluster resources, and
|
||||
view logs.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public kompose
|
||||
(package
|
||||
(name "kompose")
|
||||
(version "1.30.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/kubernetes/kompose/releases/download/v"
|
||||
version "/kompose-linux-amd64"))
|
||||
(sha256
|
||||
(base32
|
||||
"0sy3ci7s2dkjigasyv01nm1vg30wwhmdc0cmglzb23ws8bfrfjlh"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:substitutable? #f
|
||||
#:install-plan
|
||||
#~'(("kompose" "bin/"))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'unpack
|
||||
(lambda _
|
||||
(copy-file #$source "./kompose")))
|
||||
(add-before 'install 'chmod
|
||||
(lambda _
|
||||
(chmod "kompose" #o555))))))
|
||||
(home-page "https://kompose.io")
|
||||
(supported-systems '("x86_64-linux"))
|
||||
(synopsis "Go from Docker Compose to Kubernetes")
|
||||
(description
|
||||
"Kompose is a conversion tool for Docker Compose to container orchestrators
|
||||
such as Kubernetes (or OpenShift).")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public helm-kubernetes
|
||||
(package
|
||||
(name "helm-kubernetes")
|
||||
(version "3.12.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://get.helm.sh/helm-v" version "-linux-amd64.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1d99c506shnz5cr9xhkrla5r82nan7v3hz631jqflicd376i68qv"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:substitutable? #f
|
||||
#:install-plan
|
||||
#~'(("linux-amd64/helm" "bin/"))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'unpack
|
||||
(lambda _
|
||||
(invoke "tar" "-xvf" #$source)))
|
||||
(add-before 'install 'chmod
|
||||
(lambda _
|
||||
(chmod "linux-amd64/helm" #o555))))))
|
||||
(home-page "https://helm.sh")
|
||||
(supported-systems '("x86_64-linux"))
|
||||
(synopsis "The package manager for Kubernetes")
|
||||
(description
|
||||
"Helm helps you manage Kubernetes applications - Helm Charts help you
|
||||
define, install, and upgrade Kubernetes applications.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public kind
|
||||
(package
|
||||
(name "kind")
|
||||
(version "0.20.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://kind.sigs.k8s.io/dl/v" version "/kind-linux-amd64"))
|
||||
(sha256
|
||||
(base32
|
||||
"1v9x953a5n0l3kz78wm29yh11vz56nmlvhi7xzcjscyksq9p4fji"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:substitutable? #f
|
||||
#:install-plan
|
||||
#~'(("kind" "bin/"))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'unpack
|
||||
(lambda _
|
||||
(copy-file #$source "./kind")
|
||||
(chmod "kind" #o644)))
|
||||
(add-before 'install 'chmod
|
||||
(lambda _
|
||||
(chmod "kind" #o555))))))
|
||||
(home-page "https://kind.sigs.k8s.io")
|
||||
(synopsis "Tool for running local Kubernetes clusters using Docker containers")
|
||||
(description "kind (Kubernetes in Docker) is designed for creating and managing
|
||||
local Kubernetes clusters using Docker containers as nodes. It provides
|
||||
a fast and straightforward way to run Kubernetes for development and
|
||||
testing tasks.
|
||||
|
||||
Supporting multi-node cluster configurations, kind is ideal for testing
|
||||
more complex, real-world scenarios without demanding extensive resources.
|
||||
It’s a lightweight, portable, and configurable solution useful in
|
||||
continuous integration (CI) workflows.")
|
||||
(license license:asl2.0)))
|
||||
|
|
@ -102,11 +102,8 @@
|
|||
"The unmodified Linux kernel, including nonfree blobs, for running Guix System
|
||||
on hardware which requires nonfree software to function."))))
|
||||
|
||||
(define-public linux-6.4
|
||||
(corrupt-linux linux-libre-6.4))
|
||||
|
||||
(define-public linux-6.3
|
||||
(corrupt-linux linux-libre-6.3))
|
||||
(define-public linux-6.5
|
||||
(corrupt-linux linux-libre-6.5))
|
||||
|
||||
(define-public linux-6.1
|
||||
(corrupt-linux linux-libre-6.1))
|
||||
|
|
@ -126,7 +123,7 @@ on hardware which requires nonfree software to function."))))
|
|||
(define-public linux-4.14
|
||||
(corrupt-linux linux-libre-4.14))
|
||||
|
||||
(define-public linux linux-6.3)
|
||||
(define-public linux linux-6.5)
|
||||
;; linux-lts points to the *newest* released long-term support version.
|
||||
(define-public linux-lts linux-6.1)
|
||||
|
||||
|
|
@ -247,14 +244,14 @@ stable, responsive and smooth desktop experience."))))
|
|||
(define-public linux-firmware
|
||||
(package
|
||||
(name "linux-firmware")
|
||||
(version "20230515")
|
||||
(version "20230919")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kernel.org/linux/kernel/firmware/"
|
||||
"linux-firmware-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0lg9l42bwyr0xn4vss0hy4xgap43djfhvddclqr4gs8ydyhwy6lb"))))
|
||||
"1bc4y0w2xa9r3wb7bprdmy6vqj7swxbc9p542zhc9bxx086xmylp"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
|
|
@ -1072,7 +1069,7 @@ driver:
|
|||
(define-public intel-microcode
|
||||
(package
|
||||
(name "intel-microcode")
|
||||
(version "20230613")
|
||||
(version "20230808")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -1083,7 +1080,7 @@ driver:
|
|||
(commit (string-append "microcode-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1clwzzivs6w8d35dpfv6ardi2gnhpsk1sr31dw7vq227yv0pvzml"))))
|
||||
(base32 "1n0w6q46xag7a9iddl3v1gh1rzv9h6kiyy739ac6vg3v8lazh9n7"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list #:install-plan
|
||||
|
|
|
|||
|
|
@ -125,8 +125,8 @@ then open a browser at http://localhost:PORT, where PORT is the indicated port."
|
|||
"https://franz.com/ftp/pub/legal/ACL-Express-20170301.pdf"))))
|
||||
|
||||
(define-public sbcl-cl-electron
|
||||
(let ((commit "f2b8615ec398c88a35c2d4e01dc41381e1e59586")
|
||||
(revision "0"))
|
||||
(let ((commit "ec8e3610be26d2d7312fab7d59d840e550b221f2")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "sbcl-cl-electron")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
|
|
@ -138,12 +138,13 @@ then open a browser at http://localhost:PORT, where PORT is the indicated port."
|
|||
(commit commit)))
|
||||
(file-name (git-file-name "cl-electron" version))
|
||||
(sha256
|
||||
(base32 "081gcfr8cn9cdyqh81pcks6s7nfmhwy5a5s8xq9k3kx61w5mk2b2"))))
|
||||
(base32 "0bmnh0xl5pvjv4pdb4a37x87zlyzr5fy7cyaws69p4p4rgzszzv8"))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(native-inputs (list ;; sbcl-lisp-unit2
|
||||
sbcl))
|
||||
(inputs (list electron node
|
||||
sbcl-cl-json sbcl-usocket sbcl-parenscript sbcl-bordeaux-threads))
|
||||
sbcl-cl-json sbcl-iolib sbcl-nclasses
|
||||
sbcl-parenscript sbcl-bordeaux-threads))
|
||||
(synopsis "Common Lisp interface to Electron")
|
||||
(home-page "https://github.com/atlas-engineer/cl-electron")
|
||||
(description "@command{cl-electron} is a binding to Electron for
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
;;; Copyright © 2022, 2023 John Kehayias <john.kehayias@protonmail.com>
|
||||
;;; Copyright © 2022 Evgenii Lepikhin <johnlepikhin@gmail.com>
|
||||
;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org>
|
||||
;;; Copyright © 2023 Raven Hallsby <karl@hallsby.org>
|
||||
|
||||
(define-module (nongnu packages messaging)
|
||||
#:use-module (gnu packages base)
|
||||
|
|
@ -35,7 +36,7 @@
|
|||
(define-public element-desktop
|
||||
(package
|
||||
(name "element-desktop")
|
||||
(version "1.11.34")
|
||||
(version "1.11.41")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -44,7 +45,7 @@
|
|||
"https://packages.riot.im/debian/pool/main/e/" name "/" name "_" version
|
||||
"_amd64.deb"))
|
||||
(sha256
|
||||
(base32 "1ijag6ppkswvbv4zhxpm1vdk929mwjhy2cg92hm85a2ykp3x0lp9"))))
|
||||
(base32 "1m07b1ykmxly16irca171z4f718as7hqsccp1q7qrqj9b5lkmv64"))))
|
||||
(supported-systems '("x86_64-linux"))
|
||||
(build-system chromium-binary-build-system)
|
||||
(arguments
|
||||
|
|
@ -68,7 +69,7 @@
|
|||
;; Fix the .desktop file binary location.
|
||||
(substitute* '("share/applications/element-desktop.desktop")
|
||||
(("/opt/Element/")
|
||||
(string-append #$output "/lib/Element/")))))
|
||||
(string-append #$output "/bin/")))))
|
||||
(add-after 'install 'symlink-binary-file-and-cleanup
|
||||
(lambda _
|
||||
(delete-file (string-append #$output "/environment-variables"))
|
||||
|
|
@ -97,7 +98,7 @@ its core.")
|
|||
(define-public signal-desktop
|
||||
(package
|
||||
(name "signal-desktop")
|
||||
(version "6.25.0")
|
||||
(version "6.30.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
|
@ -106,7 +107,7 @@ its core.")
|
|||
"https://updates.signal.org/desktop/apt/pool/s/" name "/" name "_" version
|
||||
"_amd64.deb"))
|
||||
(sha256
|
||||
(base32 "1kyd1dmlihsyv269vdc2ib7vlhiinxmlkyqs6ac6y0xjk2ixarp9"))))
|
||||
(base32 "1kxxb6s7h2llksmqrjbk9nhp55r0v7573h3qz44ssb2kx8xxwgdb"))))
|
||||
(supported-systems '("x86_64-linux"))
|
||||
(build-system chromium-binary-build-system)
|
||||
(arguments
|
||||
|
|
@ -131,7 +132,7 @@ its core.")
|
|||
;; Fix the .desktop file binary location.
|
||||
(substitute* '("share/applications/signal-desktop.desktop")
|
||||
(("/opt/Signal/")
|
||||
(string-append #$output "/lib/Signal/")))))
|
||||
(string-append #$output "/bin/")))))
|
||||
(add-after 'install 'symlink-binary-file-and-cleanup
|
||||
(lambda _
|
||||
(delete-file (string-append #$output "/environment-variables"))
|
||||
|
|
@ -159,14 +160,14 @@ or iOS.")
|
|||
(define-public zoom
|
||||
(package
|
||||
(name "zoom")
|
||||
(version "5.14.5.2430")
|
||||
(version "5.15.12.7665")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://cdn.zoom.us/prod/" version "/zoom_x86_64.tar.xz"))
|
||||
(file-name (string-append name "-" version "-x86_64.tar.xz"))
|
||||
(sha256
|
||||
(base32 "1as9fvzc3wqm73zx3m790yn2rk4hxr4yz2ig72v1va7i1v060zy2"))))
|
||||
(base32 "1pmxgfafwlxnrcw1fay91krjqbf1kaf5ng4f3na0p6liyd5c6fhq"))))
|
||||
(supported-systems '("x86_64-linux"))
|
||||
(build-system binary-build-system)
|
||||
(arguments
|
||||
|
|
@ -281,6 +282,8 @@ or iOS.")
|
|||
"pango"
|
||||
"pulseaudio"
|
||||
"xcb-util"
|
||||
"xcb-util-image"
|
||||
"xcb-util-keysyms"
|
||||
"xcb-util-wm"
|
||||
"xcb-util-renderutil"
|
||||
"zlib")))))
|
||||
|
|
@ -320,6 +323,8 @@ or iOS.")
|
|||
"pango"
|
||||
"pulseaudio"
|
||||
"xcb-util"
|
||||
"xcb-util-image"
|
||||
"xcb-util-keysyms"
|
||||
"xcb-util-wm"
|
||||
"xcb-util-renderutil"
|
||||
"zlib")))))))
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
|
||||
;;; Copyright © 2021, 2022, 2023 John Kehayias <john.kehayias@protonmail.com>
|
||||
;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
;;; Copyright © 2023 Tomas Volf <wolf@wolfsden.cz>
|
||||
|
||||
(define-module (nongnu packages mozilla)
|
||||
#:use-module (guix build-system gnu)
|
||||
|
|
@ -64,6 +65,7 @@
|
|||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages rust)
|
||||
#:use-module (gnu packages rust-apps)
|
||||
#:use-module (gnu packages speech)
|
||||
#:use-module (gnu packages sqlite)
|
||||
#:use-module (gnu packages video)
|
||||
#:use-module (nongnu packages wasm)
|
||||
|
|
@ -93,21 +95,21 @@
|
|||
(base32
|
||||
"0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4"))))))
|
||||
|
||||
;; Update this id with every firefox update to it's release date.
|
||||
;; It's used for cache validation and therefor can lead to strange bugs.
|
||||
(define %firefox-esr-build-id "20230704000000")
|
||||
;; 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 "20231023135350")
|
||||
|
||||
(define-public firefox-esr
|
||||
(package
|
||||
(name "firefox-esr")
|
||||
(version "102.13.0esr")
|
||||
(version "115.4.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 "0b1sq4cadzqi7rk3cz6k6l5bg5s02ivff2n3gznd2rdzwhysngzw"))))
|
||||
(base32 "0ndf8b6qj0f178k5yq9s9mjgj9csb62f0igy74dzj28vlgrxn7y3"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
|
@ -154,6 +156,7 @@
|
|||
"--disable-elf-hack"))
|
||||
#:imported-modules %cargo-utils-modules
|
||||
#:modules `((ice-9 regex)
|
||||
(ice-9 string-fun)
|
||||
(ice-9 ftw)
|
||||
(srfi srfi-1)
|
||||
(srfi srfi-26)
|
||||
|
|
@ -230,6 +233,22 @@
|
|||
(substitute* "build/RunCbindgen.py"
|
||||
(("\"--frozen\",") ""))))
|
||||
(delete 'bootstrap)
|
||||
(add-before 'configure 'patch-SpeechDispatcherService.cpp
|
||||
(lambda _
|
||||
(let* ((lib "libspeechd.so.2")
|
||||
(file "dom/media/webspeech/synth/speechd/SpeechDispatcherService.cpp")
|
||||
(old-content (call-with-input-file file get-string-all)))
|
||||
(substitute
|
||||
file
|
||||
`((,(format #f "~s" lib)
|
||||
. ,(λ (line _)
|
||||
(string-replace-substring
|
||||
line
|
||||
lib
|
||||
(string-append #$speech-dispatcher "/lib/" lib))))))
|
||||
(if (string=? old-content
|
||||
(call-with-input-file file get-string-all))
|
||||
(error "substitute did nothing, phase requires an update")))))
|
||||
(add-before 'configure 'set-build-id
|
||||
;; Firefox will write the timestamp to output, which is harmful
|
||||
;; for reproducibility, so change it to a fixed date. Use a
|
||||
|
|
@ -418,7 +437,7 @@
|
|||
gtk+
|
||||
gtk+-2
|
||||
hunspell
|
||||
icu4c
|
||||
icu4c-73
|
||||
jemalloc
|
||||
libcanberra
|
||||
libevent
|
||||
|
|
@ -442,8 +461,9 @@
|
|||
pipewire
|
||||
pixman
|
||||
pulseaudio
|
||||
startup-notification
|
||||
speech-dispatcher
|
||||
sqlite
|
||||
startup-notification
|
||||
eudev
|
||||
unzip
|
||||
zip
|
||||
|
|
@ -458,12 +478,12 @@
|
|||
wasm32-wasi-clang-toolchain
|
||||
m4
|
||||
nasm
|
||||
node
|
||||
node-lts
|
||||
perl
|
||||
pkg-config
|
||||
python
|
||||
rust-firefox-esr
|
||||
rust-cbindgen-0.23
|
||||
rust-cbindgen-0.24
|
||||
which
|
||||
yasm))
|
||||
(home-page "https://mozilla.org/firefox/")
|
||||
|
|
@ -510,22 +530,22 @@ MOZ_ENABLE_WAYLAND=1 exec ~a $@\n"
|
|||
((firefox) out))
|
||||
#t))))))
|
||||
|
||||
;; Update this id with every firefox update to it's release date.
|
||||
;; It's used for cache validation and therefor can lead to strange bugs.
|
||||
(define %firefox-build-id "20230711000000")
|
||||
;; 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 "20231010000000")
|
||||
|
||||
(define-public firefox
|
||||
(package
|
||||
(inherit firefox-esr)
|
||||
(name "firefox")
|
||||
(version "115.0.2")
|
||||
(version "118.0.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://archive.mozilla.org/pub/firefox/releases/"
|
||||
version "/source/firefox-" version ".source.tar.xz"))
|
||||
(sha256
|
||||
(base32 "0m0nxsdsij8sx8xiynar2rivfmz9yd05hzxcjyfvvd0k9h948a3b"))))
|
||||
(base32 "08bvf9fxys5d98prjaxy2vsdq20g1rlr8jq7gkrq5xzhy8h6aql9"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments firefox-esr)
|
||||
((#:phases phases)
|
||||
|
|
@ -533,15 +553,10 @@ MOZ_ENABLE_WAYLAND=1 exec ~a $@\n"
|
|||
(replace 'set-build-id
|
||||
(lambda _
|
||||
(setenv "MOZ_BUILD_DATE" #$%firefox-build-id)))))))
|
||||
(inputs
|
||||
(modify-inputs (package-inputs firefox-esr)
|
||||
(replace "icu4c" icu4c-73)))
|
||||
(native-inputs
|
||||
(modify-inputs (package-native-inputs firefox-esr)
|
||||
(replace "rust" rust-firefox)
|
||||
(replace "rust:cargo" `(,rust-firefox "cargo"))
|
||||
(replace "node" node-lts)
|
||||
(replace "rust-cbindgen" rust-cbindgen-0.24)))
|
||||
(replace "rust:cargo" `(,rust-firefox "cargo"))))
|
||||
(description
|
||||
"Full-featured browser client built from Firefox source tree, without
|
||||
the official icon and the name \"firefox\".")))
|
||||
|
|
|
|||
|
|
@ -35,11 +35,13 @@
|
|||
(method url-fetch)
|
||||
(uri (string-append "https://developers.hp.com/sites/default/files/hplip-"
|
||||
(package-version hplip) "-plugin.run"))
|
||||
;; FIXME: this hash needs to be manually updated each time
|
||||
;; upstream is updated.
|
||||
;; TODO: Since this needs to be updated on every update to Guix's
|
||||
;; hplip in order to build, might be better to decouple this
|
||||
;; package from hplip. In the meantime, update this hash when
|
||||
;; hplip is updated in Guix.
|
||||
(sha256
|
||||
(base32
|
||||
"1396d9skaq5c5vxxi331nc81yhm9daws7awq0rcn1faq89mvygps")))))
|
||||
"09kixd9pb0p94bw3xyqy9h62gwqnbwcjjsvb2g3wvl6zxp4j1fvy")))))
|
||||
(package-native-inputs hplip)))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments hplip)
|
||||
|
|
|
|||
113
nongnu/packages/productivity.scm
Normal file
113
nongnu/packages/productivity.scm
Normal file
|
|
@ -0,0 +1,113 @@
|
|||
;;; SPDX-License-Identifier: GPL-3.0-or-later
|
||||
;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org>
|
||||
|
||||
(define-module (nongnu packages productivity)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages gl)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages pciutils)
|
||||
#:use-module (gnu packages photo)
|
||||
#:use-module (gnu packages xiph)
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module (gnu packages video)
|
||||
#:use-module (gnu packages wget)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (nonguix build-system chromium-binary)
|
||||
#:use-module ((nonguix licenses) #:prefix license:))
|
||||
|
||||
(define-public anytype
|
||||
(package
|
||||
(name "anytype")
|
||||
(version "0.35.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
(string-append "https://download.anytype.io?action=download"
|
||||
"&key=desktop&id=127051615"))
|
||||
(file-name (string-append "anytype-" version ".deb"))
|
||||
(sha256
|
||||
(base32
|
||||
"12lfy5rygnaachax62j40b1ns9qsysa94f0hgqhsjaij50kw3dlc"))))
|
||||
(build-system chromium-binary-build-system)
|
||||
(arguments
|
||||
(list
|
||||
;; almost 300MB
|
||||
#:substitutable? #f
|
||||
#:validate-runpath? #f ; TODO: fails on wrapped binary and included other files
|
||||
#:wrapper-plan
|
||||
#~(map (lambda (file)
|
||||
(string-append "opt/Anytype/" file))
|
||||
'("anytype"
|
||||
"chrome-sandbox"
|
||||
"chrome_crashpad_handler"
|
||||
"libEGL.so"
|
||||
"libffmpeg.so"
|
||||
"libGLESv2.so"
|
||||
"libvk_swiftshader.so"
|
||||
"libvulkan.so.1"
|
||||
"resources/app.asar.unpacked/node_modules/keytar/build/Release/keytar.node"))
|
||||
#:install-plan
|
||||
#~'(("opt/" "/share")
|
||||
("usr/share/" "/share"))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'unpack-deb
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(invoke "ar" "x" #$source)
|
||||
(invoke "rm" "-v" "control.tar.gz"
|
||||
"debian-binary"
|
||||
(string-append "anytype-" #$version ".deb"))
|
||||
(invoke "tar" "xvf" "data.tar.xz")
|
||||
(invoke "rm" "-vrf" "data.tar.xz")))
|
||||
(add-before 'install 'patch-assets
|
||||
(lambda _
|
||||
(let* ((bin (string-append #$output "/bin"))
|
||||
(icon (string-append #$output "/share/icons/hicolor/0x0/apps/anytype.png"))
|
||||
(usr/share "./usr/share")
|
||||
(old-exe "/opt/Anytype/anytype")
|
||||
(exe (string-append bin "/anytype")))
|
||||
(substitute* (string-append usr/share "/applications/anytype.desktop")
|
||||
(("^Icon=anytype") (string-append "Icon=" icon))
|
||||
(((string-append "^Exec=" old-exe)) (string-append "Exec=" exe))))))
|
||||
(add-before 'install-wrapper 'symlink-entrypoint
|
||||
(lambda _
|
||||
(let* ((bin (string-append #$output "/bin"))
|
||||
(exe (string-append bin "/anytype"))
|
||||
(share (string-append #$output "/share/Anytype"))
|
||||
(target (string-append share "/anytype")))
|
||||
(mkdir-p bin)
|
||||
(symlink target exe)
|
||||
(wrap-program exe
|
||||
`("LD_LIBRARY_PATH" = (,share)))))))))
|
||||
(native-inputs (list tar))
|
||||
(inputs
|
||||
(list bzip2
|
||||
flac
|
||||
gdk-pixbuf
|
||||
harfbuzz
|
||||
libexif
|
||||
libglvnd
|
||||
libpng
|
||||
libva
|
||||
libxscrnsaver
|
||||
opus
|
||||
pciutils
|
||||
snappy
|
||||
util-linux
|
||||
xdg-utils
|
||||
wget))
|
||||
(synopsis "Productivity and note-taking app")
|
||||
(supported-systems '("x86_64-linux"))
|
||||
(description "Anytype is an E2E encrypted, cross-platform, productivity and
|
||||
note taking app. It stores all the data locally and allows for peer-to-peer
|
||||
synchronization.")
|
||||
(home-page "https://anytype.io")
|
||||
(license (license:nonfree
|
||||
"https://github.com/anyproto/anytype-ts/blob/main/LICENSE.md"))))
|
||||
|
|
@ -32,6 +32,7 @@
|
|||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages graphics)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages libbsd)
|
||||
#:use-module (gnu packages libusb)
|
||||
#:use-module (gnu packages linux)
|
||||
|
|
@ -46,6 +47,7 @@
|
|||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages toolkits)
|
||||
#:use-module (gnu packages video)
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module (nonguix multiarch-container)
|
||||
#:use-module (nonguix utils))
|
||||
|
||||
|
|
@ -104,6 +106,28 @@
|
|||
(description "Steam is a digital software distribution platform created by Valve.")
|
||||
(license (license:nonfree "file:///share/doc/steam/steam_subscriber_agreement.txt"))))
|
||||
|
||||
;; After guix commit to add a replacement for libx11 (security fixes),
|
||||
;; 5ff0c8997a2ddf71af477883584a5f9ccd9b757f, a profile collision happens with
|
||||
;; the propagated libx11 (now grafted) from mesa and its propagated-input
|
||||
;; libxdamage. See previous upstream report (when this occurred for expat and
|
||||
;; fontconfig) at <https://issues.guix.gnu.org/53406>. So we define explicit
|
||||
;; replacement packages to workaround this issue.
|
||||
;; TODO: remove once upstream bug is fixed or libx11 is ungrafted.
|
||||
(define libxdamage-fixed
|
||||
(package
|
||||
(inherit libxdamage)
|
||||
(propagated-inputs
|
||||
(modify-inputs (package-propagated-inputs libxdamage)
|
||||
(replace "libx11" libx11-fixed)))))
|
||||
|
||||
(define mesa-fixed
|
||||
(package
|
||||
(inherit mesa)
|
||||
(propagated-inputs
|
||||
(modify-inputs (package-propagated-inputs mesa)
|
||||
(replace "libx11" libx11-fixed)
|
||||
(replace "libxdamage" libxdamage-fixed)))))
|
||||
|
||||
(define steam-client-libs
|
||||
`(("bash" ,bash) ; Required for steam startup.
|
||||
("coreutils" ,coreutils)
|
||||
|
|
@ -116,6 +140,7 @@
|
|||
("find" ,findutils) ; Required at least for some logging.
|
||||
("freetype" ,freetype) ; Required for steam login.
|
||||
("gawk" ,gawk)
|
||||
("gdk-pixbuf" ,gdk-pixbuf) ; Required for steam tray icon.
|
||||
("gcc:lib" ,gcc "lib") ; Required for steam startup.
|
||||
("grep" ,grep)
|
||||
("libbsd" ,libbsd)
|
||||
|
|
@ -126,7 +151,9 @@
|
|||
("libvdpau-va-gl" ,libvdpau-va-gl) ; Additional VDPAU support.
|
||||
("llvm" ,llvm-for-mesa) ; Required for mesa.
|
||||
("lsof" ,lsof) ; Required for some friend's list actions.
|
||||
("mesa" ,mesa) ; Required for steam startup.
|
||||
;; TODO: Set back to mesa once libx11 is ungrafted upstream or once
|
||||
;; <https://issues.guix.gnu.org/53406> is fixed.
|
||||
("mesa" ,mesa-fixed) ; Required for steam startup.
|
||||
("nss-certs" ,nss-certs) ; Required for steam login.
|
||||
("pciutils" ,pciutils) ; Tries to run lspci at steam startup.
|
||||
("procps" ,procps)
|
||||
|
|
|
|||
|
|
@ -6,14 +6,16 @@
|
|||
#:use-module (gnu packages video)
|
||||
#:use-module (guix build utils)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix utils)
|
||||
#:use-module ((guix licenses) #:prefix license:))
|
||||
|
||||
(define-public gmmlib
|
||||
(package
|
||||
(name "gmmlib")
|
||||
(version "22.3.3")
|
||||
(version "22.3.9")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -22,7 +24,7 @@
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0rbbzqpxgqklgdmbl7wjyblylm1g0jan3552scbi12z31bvq2442"))))
|
||||
"0m88lxlqqs5wdk4icf2ahbigr0q87j1c0damq7q0r55h72pf6zyv"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
;; Tests are run as part of the normal build step
|
||||
|
|
@ -38,7 +40,7 @@ for VAAPI.")
|
|||
(define-public intel-media-driver
|
||||
(package
|
||||
(name "intel-media-driver")
|
||||
(version "23.1.6")
|
||||
(version "23.3.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -47,16 +49,16 @@ for VAAPI.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"14yvnxaxq5i7s3a1zy9nr0i4si0i630ln54nbqkhjxqjxr9l2p37"))))
|
||||
"1zh6zgfyp14zlnd6jvhqz9q5rlyk7cb3nam791slh0h7r5f0iimm"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs (list libva gmmlib))
|
||||
(native-inputs (list pkg-config))
|
||||
(arguments
|
||||
'(#:tests? #f ;Tests are run as part of the normal build step
|
||||
#:configure-flags
|
||||
(list "-DENABLE_NONFREE_KERNELS=OFF"
|
||||
(string-append "-DLIBVA_DRIVERS_PATH="
|
||||
(assoc-ref %outputs "out") "/lib/dri"))))
|
||||
(list #:tests? #f ;Tests are run as part of the normal build step
|
||||
#:configure-flags
|
||||
#~(list "-DENABLE_NONFREE_KERNELS=OFF"
|
||||
(string-append "-DLIBVA_DRIVERS_PATH="
|
||||
#$output "/lib/dri"))))
|
||||
;; XXX Because of <https://issues.guix.gnu.org/issue/22138>, we need to add
|
||||
;; this to all VA-API back ends instead of once to libva.
|
||||
(native-search-paths
|
||||
|
|
@ -71,3 +73,22 @@ for VAAPI.")
|
|||
accelerated decoding, encoding, and video post processing for the GEN based
|
||||
graphics hardware.")
|
||||
(license (list license:expat license:bsd-3))))
|
||||
|
||||
(define-public intel-media-driver/nonfree
|
||||
(package
|
||||
(inherit intel-media-driver)
|
||||
(name "intel-media-driver-nonfree")
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments intel-media-driver)
|
||||
((#:configure-flags flags #~'())
|
||||
#~(cons "-DENABLE_NONFREE_KERNELS=ON"
|
||||
(delete "-DENABLE_NONFREE_KERNELS=OFF" #$flags)))))
|
||||
(synopsis
|
||||
(string-append
|
||||
(package-synopsis intel-media-driver)
|
||||
" with nonfree kernels"))
|
||||
(description
|
||||
(string-append
|
||||
(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."))))
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
(define-public winetricks
|
||||
(package
|
||||
(name "winetricks")
|
||||
(version "20220411")
|
||||
(version "20230212")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"09bv6wsm3y9p6jhlcmnjlnczdyr996b2mvxg4fbvlqa3fv9gac8n"))))
|
||||
"15glm6ws0zihcks93l39mli8wf5b5vkijb0vaid9cqra6x0zppd5"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("cabextract" ,cabextract)
|
||||
|
|
|
|||
|
|
@ -83,11 +83,10 @@
|
|||
("expat" ,expat)
|
||||
("fontconfig" ,fontconfig)
|
||||
("freetype" ,freetype)
|
||||
("gcc:lib" ,(make-libstdc++ gcc))
|
||||
("gcc:lib" ,gcc "lib")
|
||||
("glib" ,glib)
|
||||
("gtk+" ,gtk+)
|
||||
("libdrm" ,libdrm)
|
||||
("libgccjit" ,libgccjit)
|
||||
("libnotify" ,libnotify)
|
||||
("librsvg" ,librsvg)
|
||||
("libsecret" ,libsecret)
|
||||
|
|
|
|||
|
|
@ -463,12 +463,14 @@ application."
|
|||
'("/run/current-system/profile/etc"
|
||||
"/run/current-system/profile/share"
|
||||
"/sbin"
|
||||
"/usr/share/vulkan/icd.d"
|
||||
"/usr/share/vulkan/implicit_layer.d")) ; Implicit layers like MangoHud
|
||||
"/usr/share/vulkan/icd.d"))
|
||||
(for-each
|
||||
new-symlink
|
||||
`((,ld.so.cache . "/etc/ld.so.cache")
|
||||
(,ld.so.conf . "/etc/ld.so.conf") ;; needed?
|
||||
;; For MangoHud implicit layers.
|
||||
((,guix-env "share/vulkan/implicit_layer.d") .
|
||||
"/usr/share/vulkan/implicit_layer.d")
|
||||
((,guix-env "etc/ssl") . "/etc/ssl")
|
||||
((,guix-env "etc/ssl") . "/run/current-system/profile/etc/ssl")
|
||||
((,union32 "lib") . "/lib")
|
||||
|
|
@ -479,17 +481,12 @@ application."
|
|||
((,union64 "lib") . "/run/current-system/profile/lib64")
|
||||
((,union64 "lib/locale") . "/run/current-system/locale")
|
||||
((,union64 "sbin/ldconfig") . "/sbin/ldconfig")
|
||||
((,union64 "share/mime") . "/usr/share/mime") ; Steam tray icon.
|
||||
((,union64 "share/drirc.d") . "/usr/share/drirc.d")
|
||||
((,union64 "share/fonts") . "/run/current-system/profile/share/fonts")
|
||||
((,union64 "etc/fonts") . "/etc/fonts")
|
||||
((,union64 "share/vulkan/explicit_layer.d") .
|
||||
"/usr/share/vulkan/explicit_layer.d")
|
||||
;; The MangoHud layer has the same file name for 64- and 32-bit,
|
||||
;; so create links with different names.
|
||||
((,union64 "share/vulkan/implicit_layer.d/MangoHud.json") .
|
||||
"/usr/share/vulkan/implicit_layer.d/MangoHud.json")
|
||||
((,union32 "share/vulkan/implicit_layer.d/MangoHud.json") .
|
||||
"/usr/share/vulkan/implicit_layer.d/MangoHud.x86.json")))
|
||||
"/usr/share/vulkan/explicit_layer.d")))
|
||||
(for-each
|
||||
icd-symlink
|
||||
;; Use stat to follow links from packages like MangoHud.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue