diff options
| author | Franz Geffke <m@f-a.nz> | 2024-04-18 11:19:06 +0100 |
|---|---|---|
| committer | Franz Geffke <m@f-a.nz> | 2024-04-18 11:19:06 +0100 |
| commit | 581a908108d7edce42dbcfcd9ac17a1266854835 (patch) | |
| tree | 0cf975dd89dd7e6f771296bae4e2ff78c0ecb22f /px | |
| parent | 92c3f7cfcef8e80779cd5edf0c1ee83aef9615a4 (diff) | |
px: %default-pantherx-channel: Rename to %pantherx-default-channels
Diffstat (limited to 'px')
| -rw-r--r-- | px/system/config.scm | 18 | ||||
| -rw-r--r-- | px/system/os.scm | 6 |
2 files changed, 8 insertions, 16 deletions
diff --git a/px/system/config.scm b/px/system/config.scm index 9fa797e..3c20ca9 100644 --- a/px/system/config.scm +++ b/px/system/config.scm @@ -30,8 +30,7 @@ px-server-os px-server-ee-os - %px-server-open-ports-common - %default-pantherx-channel) + %px-server-open-ports-common) ;; Re-export for convenience #:re-export (%px-core-services @@ -51,7 +50,9 @@ %px-desktop-ee-packages %px-server-packages - %px-server-ee-packages)) + %px-server-ee-packages + + %pantherx-default-channels)) ;;; ;;; PantherX Desktop OS defintions @@ -64,17 +65,6 @@ (define %px-server-open-ports-common '(("tcp" "ssh" "http" "https"))) -;; For use in unattended-upgrade-service-type -(define %default-pantherx-channel - (channel - (name 'pantherx) - (branch "master") - (url "https://channels.pantherx.org/git/panther.git") - (introduction - (make-channel-introduction "54b4056ac571611892c743b65f4c47dc298c49da" - (openpgp-fingerprint - "A36A D41E ECC7 A871 1003 5D24 524F EB1A 9D33 C9CB"))))) - ;;; ;;; CORE ;;; diff --git a/px/system/os.scm b/px/system/os.scm index 4383928..e975602 100644 --- a/px/system/os.scm +++ b/px/system/os.scm @@ -32,8 +32,10 @@ %px-substitute-server-key %nonguix-substitute-server-key - %px-substitute-server-key - %nonguix-substitute-server-key + %px-substitute-server-url + %nonguix-substitute-server-url + + %pantherx-default-channels apply-px-substitute-server)) |