From 1b1c335f5e62cff78ab9fff9c998fc932a0e8a4e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 11 May 2013 22:49:39 +0200 Subject: gnu: Add GNU RCS. * gnu/packages/bazaar.scm: Rename to... * gnu/packages/version-control.scm: ... this. (rcs): New variable. * Makefile.am (MODULES): Adjust accordingly. --- Makefile.am | 2 +- gnu/packages/bazaar.scm | 54 ---------------------------- gnu/packages/version-control.scm | 77 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 55 deletions(-) delete mode 100644 gnu/packages/bazaar.scm create mode 100644 gnu/packages/version-control.scm diff --git a/Makefile.am b/Makefile.am index 26d9cfb2a5..3998e9123f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -73,7 +73,6 @@ MODULES = \ gnu/packages/avahi.scm \ gnu/packages/base.scm \ gnu/packages/bash.scm \ - gnu/packages/bazaar.scm \ gnu/packages/bdb.scm \ gnu/packages/bdw-gc.scm \ gnu/packages/bison.scm \ @@ -191,6 +190,7 @@ MODULES = \ gnu/packages/time.scm \ gnu/packages/tmux.scm \ gnu/packages/tor.scm \ + gnu/packages/version-control.scm \ gnu/packages/vim.scm \ gnu/packages/vpn.scm \ gnu/packages/w3m.scm \ diff --git a/gnu/packages/bazaar.scm b/gnu/packages/bazaar.scm deleted file mode 100644 index 63fe341999..0000000000 --- a/gnu/packages/bazaar.scm +++ /dev/null @@ -1,54 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Nikita Karetnikov -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages bazaar) - #:use-module ((guix licenses) #:select (gpl2+)) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system python) - #:use-module (guix build utils) - #:use-module ((gnu packages gettext) - #:renamer (symbol-prefix-proc 'guix:))) - -(define-public bazaar - (package - (name "bazaar") - (version "2.5.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://launchpad.net/bzr/2.5/" version - "/+download/bzr-" version ".tar.gz")) - (sha256 - (base32 - "10krjbzia2avn09p0cdlbx2wya0r5v11w5ymvyl72af5dkx4cwwn")))) - (build-system python-build-system) - (inputs - ;; Note: 'tools/packaging/lp-upload-release' and 'tools/weavemerge.sh' - ;; require Zsh. - `(("gettext" ,guix:gettext))) - (arguments - `(#:tests? #f)) ; no test target - (home-page "https://gnu.org/software/bazaar") - (synopsis "Decentralized revision control system") - (description - "GNU Bazaar is a distributed version control system, which supports both -central version control and distributed version control. Developers can -organize their workspace in whichever way they want. It is possible to work -from a command line or use a GUI application.") - (license gpl2+))) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm new file mode 100644 index 0000000000..74718f5149 --- /dev/null +++ b/gnu/packages/version-control.scm @@ -0,0 +1,77 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Nikita Karetnikov +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages version-control) + #:use-module ((guix licenses) #:select (gpl2+ gpl3+)) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (guix build-system python) + #:use-module (guix build utils) + #:use-module ((gnu packages gettext) + #:renamer (symbol-prefix-proc 'guix:))) + +(define-public bazaar + (package + (name "bazaar") + (version "2.5.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://launchpad.net/bzr/2.5/" version + "/+download/bzr-" version ".tar.gz")) + (sha256 + (base32 + "10krjbzia2avn09p0cdlbx2wya0r5v11w5ymvyl72af5dkx4cwwn")))) + (build-system python-build-system) + (inputs + ;; Note: 'tools/packaging/lp-upload-release' and 'tools/weavemerge.sh' + ;; require Zsh. + `(("gettext" ,guix:gettext))) + (arguments + `(#:tests? #f)) ; no test target + (home-page "https://gnu.org/software/bazaar") + (synopsis "Decentralized revision control system") + (description + "GNU Bazaar is a distributed version control system, which supports both +central version control and distributed version control. Developers can +organize their workspace in whichever way they want. It is possible to work +from a command line or use a GUI application.") + (license gpl2+))) + +(define-public rcs + (package + (name "rcs") + (version "5.9.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/rcs/rcs-" + version ".tar.xz")) + (sha256 + (base32 + "0w26vsx732dcmb5qfhlkkzvrk1sx6d74qibrn914n14j0ci90jcq")))) + (build-system gnu-build-system) + (home-page "http://www.gnu.org/software/rcs/") + (synopsis "Per-file local revision control system") + (description + "The GNU Revision Control System (RCS) manages multiple revisions of +files. RCS automates the storing, retrieval, logging, identification, and +merging of revisions. RCS is useful for text that is revised frequently, +including source code, programs, documentation, graphics, papers, and form +letters.") + (license gpl3+))) -- cgit v1.2.3