Merge remote-tracking branch 'upstream/master' into HEAD (8f2ea38f) · Commits · nix / nixpkgs

.travis.yml

+6 −0

Original line number	Diff line number	Diff line
		@@ -12,15 +12,21 @@ matrix:
		script:
		- ./maintainers/scripts/travis-nox-review-pr.sh nixpkgs-verify nixpkgs-manual nixpkgs-tarball nixpkgs-unstable
		- ./maintainers/scripts/travis-nox-review-pr.sh nixos-options nixos-manual
		env:
		- BUILD_TYPE="Test Nixpkgs evaluation & NixOS manual build"
		- os: linux
		sudo: required
		dist: trusty
		before_script:
		- sudo mount -o remount,exec,size=2G,mode=755 /run/user
		script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr
		env:
		- BUILD_TYPE="Build affected packages (Linux)"
		- os: osx
		osx_image: xcode7.3
		script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr
		env:
		- BUILD_TYPE="Build affected packages (macOS)"
		env:
		global:
		- GITHUB_TOKEN=5edaaf1017f691ed34e7f80878f8f5fbd071603f

doc/languages-frameworks/ruby.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ $ cd sensu
		$ cat > Gemfile
		source 'https://rubygems.org'
		gem 'sensu'
		$ $(nix-build '<nixpkgs>' -A bundix)/bin/bundix --magic
		$ $(nix-build '<nixpkgs>' -A bundix --no-out-link)/bin/bundix --magic
		$ cat > default.nix
		{ lib, bundlerEnv, ruby }:

		@@ -114,6 +114,7 @@ in stdenv.mkDerivation {
		script = ./my-script.rb;
		buildCommand = ''
		install -D -m755 $script $out/bin/my-script
		patchShebangs $out/bin/my-script
		'';
		}]]>
		</programlisting>

lib/maintainers.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -602,6 +602,7 @@
		vdemeester = "Vincent Demeester <vincent@sbr.pm>";
		veprbl = "Dmitry Kalinkin <veprbl@gmail.com>";
		vifino = "Adrian Pistol <vifino@tty.sh>";
		vinymeuh = "VinyMeuh <vinymeuh@gmail.com>";
		viric = "Lluís Batlle i Rossell <viric@viric.name>";
		vizanto = "Danny Wilson <danny@prime.vc>";
		vklquevs = "vklquevs <vklquevs@gmail.com>";

maintainers/scripts/travis-nox-review-pr.sh

+2 −2

Original line number	Diff line number	Diff line
		@@ -53,8 +53,8 @@ while test -n "$1"; do
		nox)
		echo "=== Fetching Nox from binary cache"

		# build nox silently so it's not in the log
		nix-build "<nixpkgs>" -A nox -A stdenv
		# build nox (+ a basic nix-shell env) silently so it's not in the log
		nix-shell -p nox stdenv --command true
		;;

		pr)

nixos/modules/services/network-filesystems/ipfs.nix

+36 −3

Original line number	Diff line number	Diff line
		@@ -49,6 +49,12 @@ in
		description = "The data dir for IPFS";
		};

		defaultMode = mkOption {
		description = "systemd service that is enabled by default";
		type = types.enum [ "online" "offline" "norouting" ];
		default = "online";
		};

		autoMigrate = mkOption {
		type = types.bool;
		default = false;
		@@ -147,10 +153,11 @@ in
		systemd.services.ipfs = {
		description = "IPFS Daemon";

		wantedBy = [ "multi-user.target" ];
		wantedBy = mkIf (cfg.defaultMode == "online") [ "multi-user.target" ];

		after = [ "network.target" "local-fs.target" "ipfs-init.service" ];

		conflicts = [ "ipfs-offline.service" ];
		conflicts = [ "ipfs-offline.service" "ipfs-norouting.service"];
		wants = [ "ipfs-init.service" ];

		environment.IPFS_PATH = cfg.dataDir;
		@@ -169,9 +176,11 @@ in
		systemd.services.ipfs-offline = {
		description = "IPFS Daemon (offline mode)";

		wantedBy = mkIf (cfg.defaultMode == "offline") [ "multi-user.target" ];

		after = [ "local-fs.target" "ipfs-init.service" ];

		conflicts = [ "ipfs.service" ];
		conflicts = [ "ipfs.service" "ipfs-norouting.service"];
		wants = [ "ipfs-init.service" ];

		environment.IPFS_PATH = cfg.dataDir;
		@@ -186,5 +195,29 @@ in
		RestartSec = 1;
		};
		};

		systemd.services.ipfs-norouting = {
		description = "IPFS Daemon (no routing mode)";

		wantedBy = mkIf (cfg.defaultMode == "norouting") [ "multi-user.target" ];

		after = [ "local-fs.target" "ipfs-init.service" ];

		conflicts = [ "ipfs.service" "ipfs-offline.service"];
		wants = [ "ipfs-init.service" ];

		environment.IPFS_PATH = cfg.dataDir;

		path = [ pkgs.ipfs ];

		serviceConfig = {
		ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags} --routing=none";
		User = cfg.user;
		Group = cfg.group;
		Restart = "on-failure";
		RestartSec = 1;
		};
		};

		};
		}