diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-01-06 17:33:02 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-01-06 17:33:02 +0100 |
commit | 4050e5d6cfe8f7af29f10b2f1b3c7febdc10946a (patch) | |
tree | 574828c84e7bfb0b6850db4f30fc38bd8143584e /build-aux | |
parent | 79580eb698d07e4b21334ddfbcbcf620d27b5e41 (diff) | |
parent | 233e76769ae3a438bff7117c68f2c88739a28db0 (diff) | |
download | gnu-guix-4050e5d6cfe8f7af29f10b2f1b3c7febdc10946a.tar gnu-guix-4050e5d6cfe8f7af29f10b2f1b3c7febdc10946a.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
build-aux/download.scm
distro/packages/autotools.scm
distro/packages/base.scm
distro/packages/bootstrap.scm
distro/packages/lsh.scm
distro/packages/make-bootstrap.scm
distro/packages/ncurses.scm
distro/packages/perl.scm
tests/derivations.scm
tests/union.scm
Diffstat (limited to 'build-aux')
-rw-r--r-- | build-aux/download.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/build-aux/download.scm b/build-aux/download.scm index aad4fe3c76..97a74b123a 100644 --- a/build-aux/download.scm +++ b/build-aux/download.scm @@ -1,20 +1,20 @@ -;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*- -;;; Copyright (C) 2012, 2013 Ludovic Courtès <ludo@gnu.org> +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org> ;;; -;;; This file is part of Guix. +;;; This file is part of GNU Guix. ;;; -;;; Guix is free software; you can redistribute it and/or modify it +;;; 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. ;;; -;;; Guix is distributed in the hope that it will be useful, but +;;; 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 Guix. If not, see <http://www.gnu.org/licenses/>. +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; ;;; Download a binary file from an external source. |