ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 14:16:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove the last vestiges of GuixSD.

Browse source 
* gnu/build/vm.scm (load-in-linux-vm): Rename the RNG.
* gnu/system/vm.scm (common-qemu-options): Likewise.
(system-docker-image): Rename the ROOT-DIRECTORY.
* gnu/packages/crypto.scm (eschalot)[arguments]: Use a different
arbitrary string.
* gnu/packages/wicd.scm (wicd)[arguments]: Remove unused configure flag.
* gnu/packages/xorg.scm (xorg-server): Set a more accurate OS vendor.
This commit is contained in:
Tobias Geerinckx-Rice 2020-09-20 21:14:52 +02:00
parent 7dff329862
commit 222c6b9408
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
6 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/build/vm.scm
View file

@ -164,8 +164,8 @@ (define arch-specific-flags
"-cpu" "max" "-cpu" "max"
"-m" (number->string memory-size) "-m" (number->string memory-size)
"-nic" "user,model=virtio-net-pci" "-nic" "user,model=virtio-net-pci"
"-object" "rng-random,filename=/dev/urandom,id=guixsd-vm-rng" "-object" "rng-random,filename=/dev/urandom,id=guix-vm-rng"
"-device" "virtio-rng-pci,rng=guixsd-vm-rng" "-device" "virtio-rng-pci,rng=guix-vm-rng"
"-virtfs" "-virtfs"
(string-append "local,id=store_dev,path=" (string-append "local,id=store_dev,path="
(%store-directory) (%store-directory)

4
gnu/packages/backup.scm
View file

@ -812,8 +812,8 @@ (define-public dirvish
(output-dir (output-dir
(assoc-ref outputs "out")) (assoc-ref outputs "out"))
;; Just a default... not so useful on guixsd though ;; Just a default... not so useful on Guix Systems though.
;; You probably want to a service with file(s) to point to. ;; You probably want a service with file(s) to point to.
(confdir "/etc/dirvish") (confdir "/etc/dirvish")
(perl (string-append (assoc-ref %build-inputs "perl") (perl (string-append (assoc-ref %build-inputs "perl")

2
gnu/packages/crypto.scm
View file

@ -376,7 +376,7 @@ (define-public eschalot
(lambda _ (lambda _
(invoke "./worgen" "8-12" "top1000.txt" "3-10" "top400nouns.txt" (invoke "./worgen" "8-12" "top1000.txt" "3-10" "top400nouns.txt"
"3-6" "top150adjectives.txt" "3-6") "3-6" "top150adjectives.txt" "3-6")
(invoke "./eschalot" "-r" "^guix|^guixsd") (invoke "./eschalot" "-r" "^guix|^GuixSystem")
(invoke "./eschalot" "-r" "^gnu|^free") (invoke "./eschalot" "-r" "^gnu|^free")
(invoke "./eschalot" "-r" "^cyber|^hack") (invoke "./eschalot" "-r" "^cyber|^hack")
(invoke "./eschalot" "-r" "^troll"))) (invoke "./eschalot" "-r" "^troll")))

5
gnu/packages/wicd.scm
View file

@ -123,7 +123,10 @@ (define (which* cmd)
"--no-install-kde" "--no-install-kde"
"--no-install-gnome-shell-extensions" "--no-install-gnome-shell-extensions"
"--distro=guixsd" ;; Don't pass --distro= despite setup.py's complaints.
;; Guix isn't recognised, and if it ever would be we'd
;; rather ask upstream to follow standards instead.
"--wicdgroup=netdev" "--wicdgroup=netdev"
"--loggroup=root" "--loggroup=root"
"--logperms=0640" "--logperms=0640"

6
gnu/packages/xorg.scm
View file

@ -5400,13 +5400,11 @@ (define-public xorg-server
;; The default is to use "uname -srm", which captures the kernel ;; The default is to use "uname -srm", which captures the kernel
;; version and makes builds non-reproducible. ;; version and makes builds non-reproducible.
"--with-os-name=GNU" "--with-os-name=GNU"
"--with-os-vendor=Guix" ; not strictly needed, but looks nice
"--with-os-vendor=GuixSD" ;not strictly needed, but looks nice
;; For the log file, etc. ;; For the log file, etc.
"--localstatedir=/var" "--localstatedir=/var"
;; For sddm ;; For sddm.
"--enable-kdrive" "--enable-kdrive"
"--enable-xephyr") "--enable-xephyr")

6
gnu/system/vm.scm
View file

@ -529,7 +529,7 @@ (define build
;; Even as root in a VM, the initializer would fail due to ;; Even as root in a VM, the initializer would fail due to
;; lack of privileges if we use a root-directory that is on ;; lack of privileges if we use a root-directory that is on
;; a file system that is shared with the host (e.g., /tmp). ;; a file system that is shared with the host (e.g., /tmp).
(root-directory "/guixsd-system-root")) (root-directory "/guix-system-root"))
(set-path-environment-variable "PATH" '("bin" "sbin") '(#+tar)) (set-path-environment-variable "PATH" '("bin" "sbin") '(#+tar))
(mkdir root-directory) (mkdir root-directory)
(initialize root-directory) (initialize root-directory)
@ -820,8 +820,8 @@ (define (virtfs-option fs)
'()) '())
"-no-reboot" "-no-reboot"
"-object" "rng-random,filename=/dev/urandom,id=guixsd-vm-rng" "-object" "rng-random,filename=/dev/urandom,id=guix-vm-rng"
"-device" "virtio-rng-pci,rng=guixsd-vm-rng" "-device" "virtio-rng-pci,rng=guix-vm-rng"
#$@(map virtfs-option shared-fs) #$@(map virtfs-option shared-fs)
"-vga std" "-vga std"