branch master updated (f18bd3f -> eb52419)
alezost pushed a change to branch master in repository guix. from f18bd3f gnu: wicd: Install 'index.theme' file in the right place. new eb52419 doc: Fix typo. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: doc/guix.texi |2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
01/01: doc: Fix typo.
alezost pushed a commit to branch master in repository guix. commit eb52419266717cb0b54e07d7a17f84b3272f7993 Author: Alex KostDate: Sun Oct 11 12:18:54 2015 +0300 doc: Fix typo. * doc/guix.texi (Defining Services): Fix typo. --- doc/guix.texi |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index a3fa989..f70642d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6980,7 +6980,7 @@ build users. @node Defining Services @subsection Defining Services -The previous sections how the available services and how one can combine +The previous sections show the available services and how one can combine them in an @code{operating-system} declaration. But how do we define them in the first place? And what is a service anyway?
01/01: gnu: Add MARS.
rekado pushed a commit to branch master in repository guix. commit c23c50c734d44e8426fbffba9c5d7a250e8d025a Author: Ricardo WurmusDate: Mon Aug 31 10:09:40 2015 +0200 gnu: Add MARS. * gnu/packages/games.scm (mars): New variable. * gnu/packages/patches/mars-install.patch: New file. * gnu/packages/patches/mars-sfml-2.3.patch: New file. * gnu-system.am (dist_patch_DATA): Add them. --- gnu-system.am|2 + gnu/packages/games.scm | 58 gnu/packages/patches/mars-install.patch | 17 gnu/packages/patches/mars-sfml-2.3.patch | 151 ++ 4 files changed, 228 insertions(+), 0 deletions(-) diff --git a/gnu-system.am b/gnu-system.am index 64260dd..c1f69ac 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -560,6 +560,8 @@ dist_patch_DATA = \ gnu/packages/patches/luit-posix.patch\ gnu/packages/patches/m4-gets-undeclared.patch\ gnu/packages/patches/make-impure-dirs.patch \ + gnu/packages/patches/mars-install.patch \ + gnu/packages/patches/mars-sfml-2.3.patch \ gnu/packages/patches/maxima-defsystem-mkdir.patch\ gnu/packages/patches/mc-fix-ncurses-build.patch \ gnu/packages/patches/mcron-install.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 7eb65bb..3f1f5a9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015 David Hashe ;;; Copyright © 2015 Christopher Allan Webber +;;; Copyright © 2015 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,11 +32,14 @@ #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages admin) #:use-module (gnu packages audio) #:use-module (gnu packages boost) + #:use-module (gnu packages fribidi) + #:use-module (gnu packages game-development) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -44,6 +48,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages libcanberra) #:use-module (gnu packages libunwind) + #:use-module (gnu packages mp3) #:use-module (gnu packages image) #:use-module (gnu packages ncurses) #:use-module (gnu packages python) @@ -573,6 +578,59 @@ for common mesh file formats, and collision detection.") (home-page "http://irrlicht.sourceforge.net/;) (license license:zlib))) +(define-public mars + ;; The latest release on SourceForge relies on an unreleased version of SFML + ;; with a different API, so we take the latest version from the official + ;; repository on Github. + (let ((commit "c855d04409") +(revision "1")) +(package + (name "mars") + (version (string-append "0.7.5." revision "." commit )) + (source (origin +(method git-fetch) +(uri (git-reference + (url "https://github.com/thelaui/M.A.R.S..git;) + (commit commit))) +(file-name (string-append name "-" version)) +(sha256 + (base32 + "1r4c5gap1z2zsv4yjd34qriqkxaq4lb4rykapyzkkdf4g36lc3nh")) +(patches (list (search-patch "mars-sfml-2.3.patch") + (search-patch "mars-install.patch") + (build-system cmake-build-system) + (arguments + `(#:tests? #f; There are no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-install-path +(lambda _ + (substitute* "src/CMakeLists.txt" +(("\\$\\{CMAKE_INSTALL_PREFIX\\}/games") + "${CMAKE_INSTALL_PREFIX}/bin")) + #t)) + (add-after 'unpack 'fix-data-path +(lambda* (#:key outputs #:allow-other-keys) + (substitute* "src/System/settings.cpp" +(("C_dataPath = \"./data/\";") + (string-append "C_dataPath = \"" +(assoc-ref outputs "out") +"/share/games/marsshooter/\";"))) + #t) + (inputs + `(("mesa" ,mesa) + ("fribidi" ,fribidi) + ("taglib" ,taglib) + ("sfml" ,sfml))) + (home-page "http://marsshooter.org;) + (synopsis "2D space shooter") + (description + "M.A.R.S. is a 2D space shooter with pretty visual effects and +attractive physics. Players can battle each other or computer
branch master updated (eb52419 -> c23c50c)
rekado pushed a change to branch master in repository guix. from eb52419 doc: Fix typo. new c23c50c gnu: Add MARS. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu-system.am|2 + gnu/packages/games.scm | 58 gnu/packages/patches/mars-install.patch | 17 gnu/packages/patches/mars-sfml-2.3.patch | 151 ++ 4 files changed, 228 insertions(+), 0 deletions(-) create mode 100644 gnu/packages/patches/mars-install.patch create mode 100644 gnu/packages/patches/mars-sfml-2.3.patch
01/03: announcements: Add news entry for Chris Webber's talk.
civodul pushed a commit to branch master in repository maintenance. commit 6a325c14c1903592203ffc812dd9c64d64dea0cc Author: Ludovic CourtèsDate: Fri Sep 18 09:41:39 2015 +0200 announcements: Add news entry for Chris Webber's talk. --- doc/announcements/savannah/chicagolug.txt | 13 + 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/doc/announcements/savannah/chicagolug.txt b/doc/announcements/savannah/chicagolug.txt new file mode 100644 index 000..acbed03 --- /dev/null +++ b/doc/announcements/savannah/chicagolug.txt @@ -0,0 +1,13 @@ +[http://dustycloud.org/ Chris Webber] of [http://mediagoblin.org/ MediaGoblin] fame [https://chicagolug.org/meetings/2015-09-30.html will be giving two talks] for the Chicago GNU/Linux User Group meeting on September 30th. The first talk will discuss the state of federation on the Web, while the second one is entitled _Functional Package Management and Deployment with Guix_: + +_Tired of being stuck after an upgrade? Wish your operating system could roll forward and backwards in time, more like Git? Want a way to get really reproducible software? Or just want a better alternative to $YOUR_LANGUAGE's stressful packaging ecosystem you can run on an existing distro? And why on earth would you want something called a "symlink forest" anyway? Discover all this and more in this exciting talk about the GNU Guix project!_ + +If you're in the Chicago area, do not miss Chris! + +== About GNU Guix == + +[http://www.gnu.org/software/guix GNU Guix] is a functional package manager for the GNU system. The Guix System Distribution or GuixSD is an advanced distribution of the GNU system that relies on GNU Guix and [http://www.gnu.org/distros/free-system-distribution-guidelines.html respects the user's freedom]. + +In addition to standard package management features, Guix supports transactional upgrades and roll-backs, unprivileged package management, per-user profiles, and garbage collection. Guix uses low-level mechanisms from the Nix package manager, except that packages are defined as native [http://www.gnu.org/software/guile Guile] modules, using extensions to the [http://schemers.org Scheme] language. GuixSD offers a declarative approach to operating system configuration management, and is [...] + +GuixSD can be used on an i686 or x86_64 machine. It is also possible to use Guix on top of an already installed GNU/Linux system, including on mips64el and armv7.
03/03: Add database of the build machines.
civodul pushed a commit to branch master in repository maintenance. commit 3e4f5e168b3486d485b2cc7da51b57354109f37c Author: Ludovic CourtèsDate: Sun Oct 11 21:37:22 2015 +0200 Add database of the build machines. --- hydra/machines.rec | 106 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/hydra/machines.rec b/hydra/machines.rec new file mode 100644 index 000..6d7c07f --- /dev/null +++ b/hydra/machines.rec @@ -0,0 +1,106 @@ +# Database of the build machines and hydra.gnu.org front-end. + +Nickname: hydra +Hostname: hydra.gnu.org +Port: 22 +Physical: No +Location: FSF rack, MIT data center, Boston, MA, USA +Contact: Lisa Maginnis (nully) +Contact: Mark H Weaver +Contact: Ludovic Courtès +Contact: Andreas Enge +SystemType: n/a (front end) +Cores: 4 +BaseSystem: Trisquel 4.1 LTS + +Nickname: chapters +Hostname: chapters.gnu.org +Port: 9022 +Physical: No +Location: FSF France, France +Contact: Nacho Gonzalez +Contact: José Marchesi +SystemType: x86_64-linux +SystemType: i686-linux +Cores: 2 +BaseSystem: Debian GNU/Linux + +Nickname: gnunet +Hostname: hydra.gnunet.org +Port: 22 +Physical: Yes +Location: TUM, Munich, Germany +Contact: Christian Grothoff +Contact: Sree Harsha Totakura +Contact: Sree Harsha Totakura +SystemType: x86_64-linux +SystemType: i686-linux +Cores: 8 +BaseSystem: Debian GNU/Linux + +Nickname: jxself +Hostname: wildebeest.jxself.org +Port: 22 +Physical: Yes(?) +Location: unknown +Contact: Jason Self +Contact: Jason Self +SystemType: x86_64-linux +SystemType: i686-linux +Cores: 8 +BaseSystem: Trisquel GNU/Linux 7.0 + +Nickname: sjd +Hostname: guix.sjd.se +Port: 22 +Physical: No +Location: Sweden +Contact: Simon Joseffson +SystemType: x86_64-linux +SystemType: i686-linux +Cores: 8 +BaseSystem: Debian GNU/Linux 8 +MuninURL: https://munin.sjd.se/munin/sjd.se/guix.sjd.se/index.html + +Nickname: hydra-slave1 +Hostname: hydra-slave1.netris.org +Port: 7275 +Physical: Yes +Vendor: Novena +Location: Boston, MA, USA +Contact: Mark H Weaver +SystemType: armhf-linux +Cores: 2 # actually 4, but 2 of them are disabled +BaseSystem: Debian GNU/Linux + +Nickname: hydra-slave0 +Hostname: hydra-slave0.gnu.org +Port: 7272 +Physical: Yes +Vendor: Loongson +Location: Boston, MA, USA +Contact: Mark H Weaver +Contact: Lisa Maginnis (nully) +SystemType: mips64el-linux +Cores: 2 +BaseSystem: Debian GNU/Linux (?) + +Nickname: librenote +Hostname: librenote.netris.org +Port: 7272 +Vendor: Loongson +Location: Boston, MA, USA +Contact: Mark H Weaver +SystemType: mips64el-linux +Cores: 2 +BaseSystem: Debian GNU/Linux (?) + +Nickname: enge-armhf +Hostname: enge.fr +Port: 9022 +Physical: Yes +Vendor: Novena +Location: Bordeaux, France +Contact: Andreas Enge +Cores: 4 +BaseSystem: Debian GNU/Linux (?)
02/03: announcements: Add entry for Cyril's PyConFR talk.
civodul pushed a commit to branch master in repository maintenance. commit 9fda4f4dac2906b0b64b53d90936643330d0 Author: Ludovic CourtèsDate: Sun Oct 11 21:35:41 2015 +0200 announcements: Add entry for Cyril's PyConFR talk. --- doc/announcements/savannah/pyconfr.txt | 13 + 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/doc/announcements/savannah/pyconfr.txt b/doc/announcements/savannah/pyconfr.txt new file mode 100644 index 000..8c33011 --- /dev/null +++ b/doc/announcements/savannah/pyconfr.txt @@ -0,0 +1,13 @@ +Bonjour ! Cyril Roelandt of Red Hat who works on OpenStack will be [http://www.pycon.fr/2015/schedule/presentation/47/ giving a talk] about Guix-Tox at PyConFR in Pau, France, on October 17th. + +[https://git.framasoft.org/Steap/guix-tox Guix-Tox] is a young variant of the [http://tox.testrun.org/ Tox] "virtualenv" management tool for Python that uses [http://www.gnu.org/software/guix/manual/html_node/Invoking-guix-environment.html guix environment] as its back-end. In essence, while Tox restricts itself to building pure Python environments, Guix-Tox takes advantages of Guix to build complete environments, including dependencies that are outside Tox's control, thereby improving [...] + +If you're around, do not miss the talk. If you're a Pythonista, you can help by providing feedback on Guix-Tox! + +== About GNU Guix == + +[http://www.gnu.org/software/guix GNU Guix] is a functional package manager for the GNU system. The Guix System Distribution or GuixSD is an advanced distribution of the GNU system that relies on GNU Guix and [http://www.gnu.org/distros/free-system-distribution-guidelines.html respects the user's freedom]. + +In addition to standard package management features, Guix supports transactional upgrades and roll-backs, unprivileged package management, per-user profiles, and garbage collection. Guix uses low-level mechanisms from the Nix package manager, except that packages are defined as native [http://www.gnu.org/software/guile Guile] modules, using extensions to the [http://schemers.org Scheme] language. GuixSD offers a declarative approach to operating system configuration management, and is [...] + +GuixSD can be used on an i686 or x86_64 machine. It is also possible to use Guix on top of an already installed GNU/Linux system, including on mips64el and armv7.
branch master updated (9ec1610 -> 3e4f5e1)
civodul pushed a change to branch master in repository maintenance. from 9ec1610 announcements: Add news entry for the Hurd/MIPS/ARM ports. new 6a325c1 announcements: Add news entry for Chris Webber's talk. new 9fd announcements: Add entry for Cyril's PyConFR talk. new 3e4f5e1 Add database of the build machines. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: doc/announcements/savannah/chicagolug.txt | 13 doc/announcements/savannah/pyconfr.txt| 13 hydra/machines.rec| 106 + 3 files changed, 132 insertions(+), 0 deletions(-) create mode 100644 doc/announcements/savannah/chicagolug.txt create mode 100644 doc/announcements/savannah/pyconfr.txt create mode 100644 hydra/machines.rec
branch master updated (c23c50c -> 7f39e18)
civodul pushed a change to branch master in repository guix. from c23c50c gnu: Add MARS. new 2da4f2d services: upower: Remove unused "upower" account. new 7f39e18 services: polkit: Use the right executable name for PAM. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/services/desktop.scm | 20 ++-- 1 files changed, 2 insertions(+), 18 deletions(-)
01/02: services: upower: Remove unused "upower" account.
civodul pushed a commit to branch master in repository guix. commit 2da4f2dd8e04fbdd7c7c25274f1bafef50c983f8 Author: Ludovic CourtèsDate: Sun Oct 11 22:16:50 2015 +0200 services: upower: Remove unused "upower" account. * gnu/services/desktop.scm (%upower-accounts): Remove. (%upower-activation): Remove references to the "upower" account. (upower-service-type): Remove extension of ACCOUNT-SERVICE-TYPE. --- gnu/services/desktop.scm | 18 +- 1 files changed, 1 insertions(+), 17 deletions(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index cf1ce82..12a48bd 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -151,24 +151,10 @@ is set to @var{value} when the bus daemon launches it." ('power-off "PowerOff")) "\n") -(define %upower-accounts ;XXX: useful? - (list (user-group (name "upower") (system? #t)) -(user-account - (name "upower") - (group "upower") - (system? #t) - (comment "UPower daemon user") - (home-directory "/var/empty") - (shell #~(string-append #$shadow "/sbin/nologin") - (define %upower-activation #~(begin (use-modules (guix build utils)) - (mkdir-p "/var/lib/upower") - (let ((user (getpwnam "upower"))) -(chown "/var/lib/upower" - (passwd:uid user) (passwd:gid user) - + (mkdir-p "/var/lib/upower"))) (define (upower-dbus-service config) (list (wrapped-dbus-service (upower-configuration-upower config) @@ -199,8 +185,6 @@ is set to @var{value} when the bus daemon launches it." upower-dbus-service) (service-extension dmd-root-service-type upower-dmd-service) - (service-extension account-service-type - (const %upower-accounts)) (service-extension activation-service-type (const %upower-activation)) (service-extension udev-service-type
02/02: services: polkit: Use the right executable name for PAM.
civodul pushed a commit to branch master in repository guix. commit 7f39e181dfb34db8f245f3ffafe34eec9cee910d Author: Ludovic CourtèsDate: Sun Oct 11 22:24:31 2015 +0200 services: polkit: Use the right executable name for PAM. * gnu/services/desktop.scm (%polkit-pam-services): Change "polkit-1" to "polkitd", which is the actual name of the executable. --- gnu/services/desktop.scm |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 12a48bd..69edc6d 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -424,7 +424,7 @@ site} for more information." (shell "/run/current-system/profile/sbin/nologin" (define %polkit-pam-services - (list (unix-pam-service "polkit-1"))) + (list (unix-pam-service "polkitd"))) (define (polkit-dmd-service polkit) "Return the for POLKIT."
branch wip-service-refactor deleted (was daf0864)
civodul pushed a change to branch wip-service-refactor in repository guix. was daf0864 services: Introduce extensible services. This change permanently discards the following revisions: discards daf0864 services: Introduce extensible services. discards 2bd09fe system: Account skeleton API is non-monadic. discards 24932aa guix system: Add '--derivation'. discards 9e1d90c system: pam: Use 'computed-file' instead of 'gexp->derivation'. discards 8f83cf0 gexp: Add 'scheme-file'. discards b2a21df services: nscd-service: Fit everything into . discards 8d5cd1e services: mingetty-service: Use objects. discards 03dc205 system: Make service procedures non-monadic. discards 98f1739 services: 'mingetty-service' no longer takes monadic values. discards 326c66b gexp: Add 'mixed-text-file'. discards 34c5ac6 gexp: Add 'program-file'. discards e69274d gexp: Add 'computed-file'.
branch master updated (7f39e18 -> 9d37337)
mhw pushed a change to branch master in repository guix. from 7f39e18 services: polkit: Use the right executable name for PAM. new 9d37337 gnu: guile: Add guile-wisp. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/guile.scm | 77 1 files changed, 77 insertions(+), 0 deletions(-)
01/01: gnu: guile: Add guile-wisp.
mhw pushed a commit to branch master in repository guix. commit 9d373377c96d9e83653f9edc04bbc8566a5174b6 Author: Christopher Allan WebberDate: Fri Sep 18 16:58:31 2015 -0500 gnu: guile: Add guile-wisp. * gnu/packages/guile.scm (guile-wisp): New variable. --- gnu/packages/guile.scm | 77 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index d5a95a0..1b01c4d 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -39,6 +39,7 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages gettext) #:use-module (gnu packages gdbm) + #:use-module (gnu packages python) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -600,4 +601,80 @@ interface for reading articles in any format.") key-value cache and store.") (license lgpl3+))) +(define-public guile-wisp + (package +(name "guile-wisp") +(version "0.9.0") +(source (origin + (method url-fetch) + (uri (string-append "https://bitbucket.org/ArneBab/; + "wisp/downloads/wisp-" + version ".tar.gz")) + (sha256 + (base32 +"0y5fxacalkgbv9s71h58vdvm2h2ln3rk024dd0vszwcf953as5fq" +(build-system gnu-build-system) +(arguments + `(#:modules ((system base compile) + ,@%gnu-build-system-modules) + #:phases + (modify-phases %standard-phases + (add-before + 'configure 'substitute-before-config + + (lambda* (#:key inputs #:allow-other-keys) +(let ((bash (assoc-ref inputs "bash"))) + ;; configure checks for guile-2.0, but ours is just named "guile" :) + (substitute* "configure" +(("guile-2.0") "guile")) + ;; Puts together some test files with /bin/bash hardcoded + (substitute* "Makefile.in" +(("/bin/bash") + (string-append bash "/bin/bash") )) + #t))) + + ;; auto compilation breaks, but if we set HOME to /tmp, + ;; that works ok + (add-before + 'check 'auto-compile-hacky-workaround + (lambda _ +(setenv "HOME" "/tmp") +#t)) + (replace + 'install + (lambda* (#:key outputs inputs #:allow-other-keys) +(let* ((out (assoc-ref outputs "out")) + (module-dir (string-append out "/share/guile/site/2.0")) + (language-dir +(string-append module-dir "/language/wisp")) + (guild (string-append (assoc-ref inputs "guile") + "/bin/guild"))) + ;; Make installation directories. + (mkdir-p module-dir) + (mkdir-p language-dir) + + ;; copy the source + (copy-file "wisp-scheme.scm" + (string-append module-dir "/wisp-scheme.scm")) + (copy-file "language/wisp/spec.scm" + (string-append language-dir "/spec.scm")) + + ;; compile to the destination + (compile-file "wisp-scheme.scm" +#:output-file (string-append + module-dir "/wisp-scheme.go")) + (compile-file "language/wisp/spec.scm" +#:output-file (string-append + language-dir "/spec.go")) + #t)) +(home-page "http://draketo.de/english/wisp;) +(inputs + `(("guile" ,guile-2.0) + ("python" ,python))) +(synopsis "wisp is a whitespace to lisp syntax for Guile") +(description "wisp is a syntax for Guile which provides a Python-like +whitespace-significant language. It may be easier on the eyes for some +users and in some situations.") +(license gpl3+))) + ;;; guile.scm ends here