mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Merge branch 'master' into staging
This commit is contained in:
commit
0897ad7fac
115 changed files with 2481 additions and 1060 deletions
|
@ -513,7 +513,7 @@ Internet).")
|
|||
("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("inetutils" ,inetutils)
|
||||
("qttools" ,qttools)
|
||||
("xorg-server" ,xorg-server)))
|
||||
("xorg-server" ,xorg-server-for-tests)))
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)))
|
||||
(arguments
|
||||
|
@ -578,7 +578,7 @@ propagate their changes to their respective configuration files.")
|
|||
("qttools" ,qttools)
|
||||
("shared-mime-info" ,shared-mime-info)
|
||||
;; TODO: FAM: File alteration notification http://oss.sgi.com/projects/fam
|
||||
("xorg-server" ,xorg-server))) ; for the tests
|
||||
("xorg-server" ,xorg-server-for-tests))) ; for the tests
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)))
|
||||
(arguments
|
||||
|
@ -1108,7 +1108,7 @@ represented by a QPoint or a QSize.")
|
|||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("qttools" ,qttools)
|
||||
("xorg-server" ,xorg-server)))
|
||||
("xorg-server" ,xorg-server-for-tests)))
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)))
|
||||
(arguments
|
||||
|
@ -1158,7 +1158,7 @@ configuration pages, message boxes, and password requests.")
|
|||
("dbus" ,dbus) ; for the tests
|
||||
("openbox" ,openbox) ; for the tests
|
||||
("qttools" ,qttools)
|
||||
("xorg-server" ,xorg-server))) ; for the tests
|
||||
("xorg-server" ,xorg-server-for-tests))) ; for the tests
|
||||
(inputs
|
||||
`(("libxrender" ,libxrender)
|
||||
("qtbase" ,qtbase)
|
||||
|
@ -2345,7 +2345,7 @@ their settings.")
|
|||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("pkg-config" ,pkg-config)
|
||||
("xorg-server" ,xorg-server)))
|
||||
("xorg-server" ,xorg-server-for-tests)))
|
||||
(inputs
|
||||
`(("kauth" ,kauth)
|
||||
("kbookmarks" ,kbookmarks)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue