diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-17T15·43+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-17T15·43+0100 |
commit | 40395860c721165f0cc36dfd15b06bc1ea8590bc (patch) | |
tree | 0d335c4964d04a84c7827c7b05b1e1116b3b6524 /third_party/nix/misc | |
parent | 0f2cf531f705d370321843e5ba9135b2ebdb5d19 (diff) |
chore(3p/nix): Remove old build system and other miscellanies r/741
There are still remnants of the old build system (for example, the build derivations are not yet updated at all), but we'll get there.
Diffstat (limited to 'third_party/nix/misc')
-rw-r--r-- | third_party/nix/misc/launchd/local.mk | 5 | ||||
-rw-r--r-- | third_party/nix/misc/launchd/meson.build | 19 | ||||
-rw-r--r-- | third_party/nix/misc/launchd/org.nixos.nix-daemon.plist.in | 27 | ||||
-rw-r--r-- | third_party/nix/misc/meson.build | 6 | ||||
-rw-r--r-- | third_party/nix/misc/systemd/local.mk | 5 | ||||
-rw-r--r-- | third_party/nix/misc/systemv/meson.build | 8 | ||||
-rwxr-xr-x | third_party/nix/misc/systemv/nix-daemon | 113 | ||||
-rw-r--r-- | third_party/nix/misc/upstart/local.mk | 5 | ||||
-rw-r--r-- | third_party/nix/misc/upstart/meson.build | 26 | ||||
-rw-r--r-- | third_party/nix/misc/upstart/nix-daemon.conf.in | 5 |
10 files changed, 0 insertions, 219 deletions
diff --git a/third_party/nix/misc/launchd/local.mk b/third_party/nix/misc/launchd/local.mk deleted file mode 100644 index 0ba722efbf19..000000000000 --- a/third_party/nix/misc/launchd/local.mk +++ /dev/null @@ -1,5 +0,0 @@ -ifeq ($(OS), Darwin) - - $(eval $(call install-data-in, $(d)/org.nixos.nix-daemon.plist, $(prefix)/Library/LaunchDaemons)) - -endif diff --git a/third_party/nix/misc/launchd/meson.build b/third_party/nix/misc/launchd/meson.build deleted file mode 100644 index c7f362cdf239..000000000000 --- a/third_party/nix/misc/launchd/meson.build +++ /dev/null @@ -1,19 +0,0 @@ -# nix launchd build file -#============================================================================ - -if (sys_name.contains('darwin')) - - launchd_data = [] - - org_nixos_nix_dameon_plist = configuration_data() - org_nixos_nix_dameon_plist.set('bindir', bindir) - - launchd_data += configure_file( - input : 'org.nixos.nix-daemon.plist.in', - output : 'org.nixos.nix-daemon.plist', - configuration : org_nixos_nix_dameon_plist) - - install_data( - corepkgs_data, - install_dir : join_paths(prefix, 'Library/LaunchDaemons')) -endif diff --git a/third_party/nix/misc/launchd/org.nixos.nix-daemon.plist.in b/third_party/nix/misc/launchd/org.nixos.nix-daemon.plist.in deleted file mode 100644 index 9f26296a9d7b..000000000000 --- a/third_party/nix/misc/launchd/org.nixos.nix-daemon.plist.in +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> - <dict> - <key>EnvironmentVariables</key> - <dict> - <key>OBJC_DISABLE_INITIALIZE_FORK_SAFETY</key> - <string>YES</string> - </dict> - <key>Label</key> - <string>org.nixos.nix-daemon</string> - <key>KeepAlive</key> - <true/> - <key>RunAtLoad</key> - <true/> - <key>ProgramArguments</key> - <array> - <string>/bin/sh</string> - <string>-c</string> - <string>/bin/wait4path /nix/var/nix/profiles/default/bin/nix-daemon && /nix/var/nix/profiles/default/bin/nix-daemon</string> - </array> - <key>StandardErrorPath</key> - <string>/var/log/nix-daemon.log</string> - <key>StandardOutPath</key> - <string>/dev/null</string> - </dict> -</plist> diff --git a/third_party/nix/misc/meson.build b/third_party/nix/misc/meson.build index 0d53faf278d5..1b381de5a16e 100644 --- a/third_party/nix/misc/meson.build +++ b/third_party/nix/misc/meson.build @@ -1,11 +1,5 @@ -# nix src build file -#============================================================================ - misc_dirs = [ - 'launchd', 'systemd', - 'systemv', - 'upstart' ] foreach dir : misc_dirs diff --git a/third_party/nix/misc/systemd/local.mk b/third_party/nix/misc/systemd/local.mk deleted file mode 100644 index 004549fd2776..000000000000 --- a/third_party/nix/misc/systemd/local.mk +++ /dev/null @@ -1,5 +0,0 @@ -ifeq ($(OS), Linux) - - $(foreach n, nix-daemon.socket nix-daemon.service, $(eval $(call install-file-in, $(d)/$(n), $(prefix)/lib/systemd/system, 0644))) - -endif diff --git a/third_party/nix/misc/systemv/meson.build b/third_party/nix/misc/systemv/meson.build deleted file mode 100644 index 275714bf7759..000000000000 --- a/third_party/nix/misc/systemv/meson.build +++ /dev/null @@ -1,8 +0,0 @@ -# nix systemd build file -#============================================================================ - -systemv_data = [] - -# install_data( -# systemv_data, -# install_dir : join_paths(prefix, 'lib/systemd/system')) diff --git a/third_party/nix/misc/systemv/nix-daemon b/third_party/nix/misc/systemv/nix-daemon deleted file mode 100755 index fea53716721d..000000000000 --- a/third_party/nix/misc/systemv/nix-daemon +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/sh -# -# nix-daemon: Starts the nix package manager daemon -# -# chkconfig: 345 24 02 -# description: This is a daemon which enable the multi-user mode -# of the nix package manager. -# processname: nix-daemon -# pidfile: /var/run/nix/nix-daemon.pid - -### BEGIN INIT INFO -# Required-Start: -# Required-Stop: -# Should-Start: -# Should-Stop: -# Default-Start: 3 4 5 -# Default-Stop: 0 1 2 6 -# Short-Description: Starts the nix daemon -# Description: This is a daemon which enable the multi-user mode -# of the nix package manager. -### END INIT INFO - -NIX_DAEMON_BIN=/usr/bin/nix-daemon -#NIX_DAEMON_USER="root" -NIX_DAEMON_USER="nix-daemon" -NIX_DAEMON_OPTS="--daemon" - -umask 0022 - -if [ "$1" = 'status' ]; then - test -x $NIX_DAEMON_BIN || exit 4 -else - test -x $NIX_DAEMON_BIN || exit 5 -fi - -# Source function library. -. /etc/init.d/functions - -LOCKFILE=/var/lock/subsys/nix-daemon -RUNDIR=/var/run/nix -PIDFILE=${RUNDIR}/nix-daemon.pid -RETVAL=0 - -base=${0##*/} - -start() { - - mkdir -p ${RUNDIR} - chown ${NIX_DAEMON_USER}:${NIX_DAEMON_USER} ${RUNDIR} - - echo -n $"Starting nix daemon... " - - daemonize -u $NIX_DAEMON_USER -p ${PIDFILE} $NIX_DAEMON_BIN $NIX_DAEMON_OPTS - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch ${LOCKFILE} - return $RETVAL -} - -stop() { - echo -n $"Shutting down nix daemon: " - killproc -p ${PIDFILE} $NIX_DAEMON_BIN - RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f ${LOCKFILE} ${PIDFILE} - echo - return $RETVAL -} - -reload() { - echo -n $"Reloading nix daemon... " - killproc -p ${PIDFILE} $NIX_DAEMON_BIN -HUP - RETVAL=$? - echo - return $RETVAL -} - -restart() { - stop - start -} - -RETVAL=0 - -# caller switch -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status -p ${PIDFILE} $NIX_DAEMON_BIN - RETVAL=$? - ;; - restart) - restart - ;; - reload) - reload - ;; - condrestart) - if [ -f $LOCKFILE ]; then - restart - fi - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart}" - exit 2 - ;; -esac - -exit $RETVAL diff --git a/third_party/nix/misc/upstart/local.mk b/third_party/nix/misc/upstart/local.mk deleted file mode 100644 index a73dc061e4fc..000000000000 --- a/third_party/nix/misc/upstart/local.mk +++ /dev/null @@ -1,5 +0,0 @@ -ifeq ($(OS), Linux) - - $(foreach n, nix-daemon.conf, $(eval $(call install-file-in, $(d)/$(n), $(sysconfdir)/init, 0644))) - -endif diff --git a/third_party/nix/misc/upstart/meson.build b/third_party/nix/misc/upstart/meson.build deleted file mode 100644 index 24731addd4ee..000000000000 --- a/third_party/nix/misc/upstart/meson.build +++ /dev/null @@ -1,26 +0,0 @@ -# ifeq ($(OS), Linux) - -# $(foreach n, nix-daemon.conf, $(eval $(call install-file-in, $(d)/$(n), $(sysconfdir)/init, 0644))) - -# endif - - -# nix systemd build file -#============================================================================ - -if (sys_name.contains('linux')) - - upstart_data = [] - - upstart_nix_daemon = configuration_data() - upstart_nix_daemon.set('bindir', bindir) - - upstart_data += configure_file( - input : 'nix-daemon.conf.in', - output : 'nix-daemon.conf', - configuration : upstart_nix_daemon) - - install_data( - upstart_data, - install_dir : join_paths(sysconfdir, 'init')) -endif diff --git a/third_party/nix/misc/upstart/nix-daemon.conf.in b/third_party/nix/misc/upstart/nix-daemon.conf.in deleted file mode 100644 index 0e806edbd770..000000000000 --- a/third_party/nix/misc/upstart/nix-daemon.conf.in +++ /dev/null @@ -1,5 +0,0 @@ -description "Nix Daemon" -start on filesystem -stop on shutdown -respawn -exec @bindir@/nix-daemon --daemon |