Compare commits

..

No commits in common. '8ca24e4559bc0b9eb5c736af1e04e600101dc593' and 'a28767296ff974dd0282f86201f77f1b4e8c8ae9' have entirely different histories.

  1. 4
      .guix-authorizations
  2. 8
      rosenthal/packages/binaries.scm
  3. 4
      rosenthal/packages/networking.scm
  4. 54
      rosenthal/packages/wm.scm

@ -3,4 +3,6 @@
(version 0) (version 0)
(;; primary: "220F 98D9 5E86 204C 0036 DA7B 6DEC 4360 408B 4185" (;; primary: "220F 98D9 5E86 204C 0036 DA7B 6DEC 4360 408B 4185"
("F4C2 D1DF 3FDE EA63 D1D3 0776 ACC6 6D09 CA52 8292" ("F4C2 D1DF 3FDE EA63 D1D3 0776 ACC6 6D09 CA52 8292"
(name "Hilton Chain")))) (name "Hilton Chain")))
(("13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7"
(name "Hilton Chain (revoked)"))))

@ -147,7 +147,7 @@ different needs.")
(define-public hugo-bin (define-public hugo-bin
(package (package
(name "hugo-bin") (name "hugo-bin")
(version "0.126.1") (version "0.125.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -155,7 +155,7 @@ different needs.")
version "/hugo_extended_" version "_linux-amd64.tar.gz")) version "/hugo_extended_" version "_linux-amd64.tar.gz"))
(sha256 (sha256
(base32 (base32
"1xrjv0w7a23bv9mcjaizamia1fg2sqwqq00d5r3z50yaiwrzr5zv")))) "1xrlmsr06q3c54a6546w9z57f3rgxihvaml94214bf6n8sj2hfq9"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list #:install-plan #~'(("hugo" "bin/")) (list #:install-plan #~'(("hugo" "bin/"))
@ -237,14 +237,14 @@ monster-in-the-middle}.")
(define-public tailscale-bin (define-public tailscale-bin
(package (package
(name "tailscale-bin") (name "tailscale-bin")
(version "1.66.4") (version "1.64.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://pkgs.tailscale.com" (uri (string-append "https://pkgs.tailscale.com"
"/stable/tailscale_" version "_amd64.tgz")) "/stable/tailscale_" version "_amd64.tgz"))
(sha256 (sha256
(base32 (base32
"147xrwrfcpzxwlcmnqy99aqzpa8xd3sg3fliqf6sj6hx9xmw26d6")))) "1kvdzgyjgp6sd2wxhq99xfsp66pb4gj7m672d477w9x2a77ds7m8"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list #:install-plan (list #:install-plan

@ -14,7 +14,7 @@
(define-public cloudflared (define-public cloudflared
(package (package
(name "cloudflared") (name "cloudflared")
(version "2024.5.0") (version "2024.4.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -26,7 +26,7 @@
;; (snippet '(delete-file-recursively "vendor")) ;; (snippet '(delete-file-recursively "vendor"))
(sha256 (sha256
(base32 (base32
"09943spv1z1iz6wcfy0n5q31rb2dyg313lw57xpfwl7p64wavw65")))) "1hxaaxi4nwb9j298l51icsqi3h68hislingry3irv7vx927yxzfp"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list #:go go-1.21 (list #:go go-1.21

@ -35,7 +35,6 @@
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages wm) #:use-module (gnu packages wm)
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xml)
#:use-module (rosenthal packages freedesktop)) #:use-module (rosenthal packages freedesktop))
(define cairo-for-hyprland (define cairo-for-hyprland
@ -109,7 +108,7 @@ command line tool called @code{udcli} that incorporates the library.")
(package (package
(inherit wayland-protocols) (inherit wayland-protocols)
(name "wayland-protocols") (name "wayland-protocols")
(version "1.36") (version "1.34")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -118,12 +117,12 @@ command line tool called @code{udcli} that incorporates the library.")
"wayland-protocols-" version ".tar.xz")) "wayland-protocols-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"14kyxywpfkgpjpkrybs28q1s2prnz30k1b4zap5a3ybrbvh4vzbi")))))) "1sxgvis0abkymc02nhx2svm60myiq3shvy759sphpxl5rp52g6y5"))))))
(define wlroots-for-hyprland (define wlroots-for-hyprland
(let ((base wlroots) (let ((base wlroots)
(revision "1") (revision "0")
(commit "5c1d51c5a2793480f5b6c4341ad0797052aec2ea")) (commit "611a4f24cd2384378f6e500253983107c6656c64"))
(package (package
(inherit base) (inherit base)
(name "wlroots") (name "wlroots")
@ -136,16 +135,7 @@ command line tool called @code{udcli} that incorporates the library.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0gy0g0kxb3q1wjqrypnvmrxcb4ld3advikchygpwpfp4s9v0mmvd")))) "0wpqa241656rcnpszkq14ikz4dxsal2xrrc7ryn22xmciw4rkxxw"))))
(arguments
(substitute-keyword-arguments (package-arguments wlroots)
((#:phases phases #~%standard-phases)
#~(modify-phases #$phases
(add-after 'unpack 'adjust-patching-script
(lambda _
(substitute* "patches/apply.sh"
(("apply \\|\\| check_applied \\|\\| fail")
"patch -Np1 < $PATCH"))))))))
(propagated-inputs (propagated-inputs
(modify-inputs (package-propagated-inputs wlroots) (modify-inputs (package-propagated-inputs wlroots)
(prepend libdrm-for-hyprland) (prepend libdrm-for-hyprland)
@ -206,15 +196,15 @@ protocols used by Hyprland to bridge the aforementioned gap.")
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/hyprwm/Hyprland" "/raw/" (uri (string-append "https://github.com/hyprwm/Hyprland" "/raw/"
"cba1ade848feac44b2eda677503900639581c3f4" "1ebc32f5f4b04c913fb6301b886e016afec4c20e"
"/nix/patches/meson-build.patch")) "/nix/patches/meson-build.patch"))
(sha256 (sha256
(base32 "0fwvsshz3k6061p3hdl175pydmj80vnw5rm4xfcn64w1ssfq7liw")))) (base32 "0v45zvh8py2awmhmi7ymr8xj0kc9ch9y4i62y4xmq2g7cmq9j6h9"))))
(define-public hyprland (define-public hyprland
(package (package
(name "hyprland") (name "hyprland")
(version "0.40.0") (version "0.39.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/hyprwm/Hyprland" (uri (string-append "https://github.com/hyprwm/Hyprland"
@ -232,7 +222,7 @@ protocols used by Hyprland to bridge the aforementioned gap.")
(patches (list hyprland-unbundle-wlroots-patch)) (patches (list hyprland-unbundle-wlroots-patch))
(sha256 (sha256
(base32 (base32
"0f4hs8qzmfmg4lr491b2inanb02xn4xa0gwb8a0ks3m64iwzx589")))) "11z7zmy4084ax0g0c2h21ji9znd2drgf0xkdllsmcdnvv27wbla8"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list #:build-type "release" (list #:build-type "release"
@ -255,7 +245,7 @@ protocols used by Hyprland to bridge the aforementioned gap.")
(string-append pre #$binutils "/bin/nm")) (string-append pre #$binutils "/bin/nm"))
(("\\<(addr2line|objcopy)\\>" _ cmd) (("\\<(addr2line|objcopy)\\>" _ cmd)
(string-append #$binutils "/bin/" cmd)))))))) (string-append #$binutils "/bin/" cmd))))))))
(native-inputs (list gcc-13 hyprwayland-scanner jq pkg-config)) (native-inputs (list gcc-13 jq pkg-config))
(inputs (inputs
(list cairo-for-hyprland (list cairo-for-hyprland
gcc-13 gcc-13
@ -297,30 +287,6 @@ more.")
language used in @code{hyprland}.") language used in @code{hyprland}.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public hyprwayland-scanner
(package
(name "hyprwayland-scanner")
(version "0.3.4")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hyprwm/hyprwayland-scanner")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0mi0kawfw311ybiy4xipy1n20nvjphkfqzgnd8jxxbkhjkwn0jhg"))))
(build-system cmake-build-system)
(arguments (list #:tests? #f)) ;No tests.
(inputs (list pugixml))
(native-inputs (list gcc-13 pkg-config))
(home-page "https://github.com/hyprwm/hyprwayland-scanner")
(synopsis "Hyprland implementation of wayland-scanner, in and for C++")
(description
"This package provides a Hyprland implementation of wayland-scanner, in and
for C++.")
(license license:bsd-3)))
(define-public grimblast (define-public grimblast
(package (package
(name "grimblast") (name "grimblast")

Loading…
Cancel
Save