[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/25: build: Remove outdated 'release.nix'.
From: |
guix-commits |
Subject: |
02/25: build: Remove outdated 'release.nix'. |
Date: |
Sun, 7 Jul 2019 09:49:42 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 866822b738cf7cc4c2e2a4c27efbd8a8db55b7a5
Author: Ludovic Courtès <address@hidden>
Date: Sun Jul 7 15:02:08 2019 +0200
build: Remove outdated 'release.nix'.
This file had been unmaintained and probably broken since ~2013.
* release.nix: Remove.
* Makefile.am (EXTRA_DIST): Adjust accordingly.
---
Makefile.am | 1 -
release.nix | 129 ------------------------------------------------------------
2 files changed, 130 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 0c4a79b..82eda60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -545,7 +545,6 @@ EXTRA_DIST +=
\
build-aux/config.rpath \
bootstrap \
doc/build.scm \
- release.nix \
$(TESTS)
if !BUILD_DAEMON_OFFLOAD
diff --git a/release.nix b/release.nix
deleted file mode 100644
index 369d54e..0000000
--- a/release.nix
+++ /dev/null
@@ -1,129 +0,0 @@
-/* GNU Guix --- Functional package management for GNU
- Copyright (C) 2012 Ludovic Courtès <address@hidden>
-
- 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 <http://www.gnu.org/licenses/>. */
-
-/* Release file to build Guix with Nix. Useful to bootstrap Guix on
- Guix-enabled Hydra instances. */
-
-let
- nixpkgs = <nixpkgs>;
-
- buildOutOfSourceTree = true;
- succeedOnFailure = true;
- keepBuildDirectory = true;
-
- # The Guile used to bootstrap the whole thing. It's normally
- # downloaded by the build system, but here we download it via a
- # fixed-output derivation and stuff it into the build tree.
- bootstrap_guile =
- let pkgs = import nixpkgs {}; in {
- i686 = pkgs.fetchurl {
- url =
http://www.fdn.fr/~lcourtes/software/guix/packages/i686-linux/20121219/guile-2.0.7.tar.xz;
- sha256 =
"45d1f9bfb9e4531a8f1c5a105f7ab094cd481b8a179ccc63cbabb73ce6b8437f";
- };
-
- x86_64 = pkgs.fetchurl {
- url =
http://www.fdn.fr/~lcourtes/software/guix/packages/x86_64-linux/20121219/guile-2.0.7.tar.xz;
- sha256 =
"953fbcc8db6e310626be79b67319cf4141dc23b296447952a99d95425b3a4dc1";
- };
- };
-
- jobs = {
- tarball =
- let pkgs = import nixpkgs {}; in
- pkgs.releaseTools.sourceTarball {
- name = "guix-tarball";
- src = <guix>;
- buildInputs = with pkgs; [ guile sqlite bzip2 git libgcrypt ];
- buildNativeInputs = with pkgs; [ texinfo gettext cvs pkgconfig ];
- preAutoconf = ''git config submodule.nix.url "${<nix>}"'';
- configureFlags =
- [ "--with-libgcrypt-prefix=${pkgs.libgcrypt}"
- "--localstatedir=/nix/var"
- ];
- };
-
- build =
- { system ? builtins.currentSystem }:
-
- let pkgs = import nixpkgs { inherit system; }; in
- pkgs.releaseTools.nixBuild {
- name = "guix";
- buildInputs = with pkgs; [ guile sqlite bzip2 libgcrypt ];
- buildNativeInputs = [ pkgs.pkgconfig ];
- src = jobs.tarball;
- configureFlags =
- [ "--with-libgcrypt-prefix=${pkgs.libgcrypt}"
- "--localstatedir=/nix/var"
- ];
-
- preBuild =
- # Use our pre-downloaded bootstrap tarballs instead of letting
- # the build system download it over and over again.
- '' mkdir -p distro/packages/bootstrap/{i686,x86_64}-linux
- cp -v "${bootstrap_guile.i686}" \
- distro/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz
- cp -v "${bootstrap_guile.x86_64}" \
- distro/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz
- '';
-
- inherit succeedOnFailure keepBuildDirectory
- buildOutOfSourceTree;
- };
-
-
- build_disable_daemon =
- { system ? builtins.currentSystem }:
-
- let
- pkgs = import nixpkgs { inherit system; };
- build = jobs.build { inherit system; };
- in
- pkgs.lib.overrideDerivation build ({ configureFlags, ... }: {
- configureFlags = configureFlags ++ [ "--disable-daemon" ];
- buildInputs = with pkgs; [ guile nixUnstable pkgconfig ];
-
- # Since we need to talk to a running daemon, we need to escape
- # the chroot.
- preConfigure = "export NIX_REMOTE=daemon";
- __noChroot = true;
- });
-
- # Jobs to test the distro.
- distro = {
- hello =
- { system ? builtins.currentSystem }:
-
- let
- pkgs = import nixpkgs { inherit system; };
- guix = jobs.build { inherit system; };
- in
- # XXX: We have no way to tell the Nix code to swallow the .drv
- # produced by `guix-build', so we have a pointless indirection
- # here. This could be worked around by generating Nix code
- # from the .drv, and importing that.
- pkgs.releaseTools.nixBuild {
- src = null;
- name = "guix-hello";
- phases = "buildPhase";
- buildPhase = "${guix}/bin/guix-build --no-substitutes hello | tee
$out";
- __noChroot = true;
- };
- };
- };
-in
- jobs
- branch master updated (aad6596 -> bf187d9), guix-commits, 2019/07/07
- 02/25: build: Remove outdated 'release.nix'.,
guix-commits <=
- 05/25: gnu: emacs-skewer-mode: Update to 1.8.0., guix-commits, 2019/07/07
- 03/25: gnu: emacs-git-timemachine: Update to 4.10., guix-commits, 2019/07/07
- 04/25: gnu: emacs-simple-httpd: Update to 1.5.1., guix-commits, 2019/07/07
- 06/25: gnu: emacs-company-restclient: Update to 0.3.0., guix-commits, 2019/07/07
- 01/25: build: Add 'doc/build.scm' to build on-line copies of the manual., guix-commits, 2019/07/07
- 11/25: gnu: emacs-md4rd: Update to 0.3.1., guix-commits, 2019/07/07
- 07/25: gnu: emacs-fish-completion: Don't use unstable tarball., guix-commits, 2019/07/07
- 09/25: gnu: emacs-restclient: Update to 0-2.422ee8d., guix-commits, 2019/07/07
- 08/25: gnu: emacs-disk-usage: Don't use unstable tarball., guix-commits, 2019/07/07
- 22/25: gnu: Add python-agate-sql., guix-commits, 2019/07/07