[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
48/64: Don't install Upstart job on Fedora
From: |
Ludovic Courtès |
Subject: |
48/64: Don't install Upstart job on Fedora |
Date: |
Mon, 05 Jan 2015 16:39:08 +0000 |
civodul pushed a commit to branch nix
in repository guix.
commit 40250f23a0a301bb758e7f0f21fcd09b702e0e1e
Author: Eelco Dolstra <address@hidden>
Date: Fri May 2 19:04:10 2014 +0200
Don't install Upstart job on Fedora
Also, don't install a nix.conf anymore, it's not needed.
http://hydra.nixos.org/build/10775854
---
nix.spec.in | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/nix.spec.in b/nix.spec.in
index 4ec8cfe..6c7eaad 100644
--- a/nix.spec.in
+++ b/nix.spec.in
@@ -117,10 +117,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-# Specify build users group
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/nix
-echo "build-users-group = %{nixbld_group}" >
$RPM_BUILD_ROOT%{_sysconfdir}/nix/nix.conf
-
# make per-user directories
for d in profiles gcroots;
do
@@ -138,6 +134,9 @@ cp -p misc/emacs/nix-mode.elc
$RPM_BUILD_ROOT%{_emacs_sitelispdir}/
# we ship this file in the base package
rm -f $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/README
+# Get rid of Upstart job.
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/init
+
%clean
rm -rf $RPM_BUILD_ROOT
- 17/64: Pass position information to primop calls, (continued)
- 17/64: Pass position information to primop calls, Ludovic Courtès, 2015/01/05
- 32/64: Simplify quick start section, Ludovic Courtès, 2015/01/05
- 43/64: Set build-max-jobs to the number of available cores by default, Ludovic Courtès, 2015/01/05
- 41/64: doc fix: swap 'import' and 'export', Ludovic Courtès, 2015/01/05
- 28/64: Ensure that systemd units to into lib, not lib64, Ludovic Courtès, 2015/01/05
- 36/64: Bump version to 1.8, Ludovic Courtès, 2015/01/05
- 44/64: Install an Upstart service, Ludovic Courtès, 2015/01/05
- 45/64: Set up directories and permissions for multi-user install automatically, Ludovic Courtès, 2015/01/05
- 46/64: Simplify multi-user installation instructions, Ludovic Courtès, 2015/01/05
- 49/64: Add ubuntu 14.04, Ludovic Courtès, 2015/01/05
- 48/64: Don't install Upstart job on Fedora,
Ludovic Courtès <=
- 51/64: Really fix the RPM builds, Ludovic Courtès, 2015/01/05
- 50/64: Fix RPM build, Ludovic Courtès, 2015/01/05
- 53/64: fix typo, Ludovic Courtès, 2015/01/05
- 52/64: Shortcut already-hardlinked files, Ludovic Courtès, 2015/01/05
- 54/64: nix-instantiate --eval: Apply auto-arguments if the result is a function, Ludovic Courtès, 2015/01/05
- 47/64: Fix Debian tests, Ludovic Courtès, 2015/01/05
- 60/64: Merge branch 'master' of github.com:wmertens/nix, Ludovic Courtès, 2015/01/05
- 58/64: Use the inodes given by readdir directly, Ludovic Courtès, 2015/01/05
- 57/64: Remove redundant code, Ludovic Courtès, 2015/01/05
- 55/64: Prepare nix-mode to be uploaded to marmalade, Ludovic Courtès, 2015/01/05