Merge master into staging-next (47990e2a) · Commits · nix / nixpkgs

maintainers/scripts/README.md

+0 −11

Original line number	Diff line number	Diff line
		@@ -52,17 +52,6 @@ The maintainer is designated by a `selector` which must be one of:

		[`maintainer-list.nix`]: ../maintainer-list.nix

		### `get-maintainer-pings-between.sh`

		Gets which maintainers would be pinged between two Nixpkgs revisions.
		Outputs a JSON object on stdout mapping GitHub usernames to the attributes that they would be getting pinged for.

		Example:

		```sh
		maintainers/scripts/get-maintainer-pings-between.sh HEAD^ HEAD
		```

		## Conventions

		### `sha-to-sri.py`

nixos/tests/restic-rest-server.nix

+6 −6

Original line number	Diff line number	Diff line
		@@ -86,7 +86,7 @@ in
		"touch /opt/excluded_file_1 /opt/excluded_file_2",

		# test that remotebackup runs custom commands and produces a snapshot
		"timedatectl set-time '2016-12-13 13:45'",
		"date -s '2016-12-13 13:45'",
		"systemctl start restic-backups-remotebackup.service",
		"rm /root/backupCleanupCommand",
		'restic-remotebackup snapshots --json \| ${pkgs.jq}/bin/jq "length \| . == 1"',
		@@ -97,23 +97,23 @@ in
		"diff -ru ${testDir} /tmp/restore-1/opt",

		# test that we can create four snapshots in remotebackup and rclonebackup
		"timedatectl set-time '2017-12-13 13:45'",
		"date -s '2017-12-13 13:45'",
		"systemctl start restic-backups-remotebackup.service",
		"rm /root/backupCleanupCommand",

		"timedatectl set-time '2018-12-13 13:45'",
		"date -s '2018-12-13 13:45'",
		"systemctl start restic-backups-remotebackup.service",
		"rm /root/backupCleanupCommand",

		"timedatectl set-time '2018-12-14 13:45'",
		"date -s '2018-12-14 13:45'",
		"systemctl start restic-backups-remotebackup.service",
		"rm /root/backupCleanupCommand",

		"timedatectl set-time '2018-12-15 13:45'",
		"date -s '2018-12-15 13:45'",
		"systemctl start restic-backups-remotebackup.service",
		"rm /root/backupCleanupCommand",

		"timedatectl set-time '2018-12-16 13:45'",
		"date -s '2018-12-16 13:45'",
		"systemctl start restic-backups-remotebackup.service",
		"rm /root/backupCleanupCommand",

nixos/tests/restic.nix

+7 −7

Original line number	Diff line number	Diff line
		@@ -247,7 +247,7 @@ in

		restic.succeed(
		# test that remotebackup runs custom commands and produces a snapshot
		"timedatectl set-time '2016-12-13 13:45'",
		"date -s '2016-12-13 13:45'",
		"systemctl start restic-backups-remotebackup.service",
		"rm /root/backupCleanupCommand",
		'restic-remotebackup snapshots --json \| ${pkgs.jq}/bin/jq "length \| . == 1"',
		@@ -255,7 +255,7 @@ in

		restic.succeed(
		# test that remotebackup runs custom commands and produces a snapshot
		"timedatectl set-time '2016-12-13 13:45'",
		"date -s '2016-12-13 13:45'",
		"systemctl start restic-backups-remotebackup.service",
		"rm /root/backupCleanupCommand",
		'restic-remotebackup snapshots --json \| ${pkgs.jq}/bin/jq "length \| . == 1"',
		@@ -297,27 +297,27 @@ in
		"grep 'check.* --some-check-option' /root/fake-restic.log",

		# test that we can create four snapshots in remotebackup and rclonebackup
		"timedatectl set-time '2017-12-13 13:45'",
		"date -s '2017-12-13 13:45'",
		"systemctl start restic-backups-remotebackup.service",
		"rm /root/backupCleanupCommand",
		"systemctl start restic-backups-rclonebackup.service",

		"timedatectl set-time '2018-12-13 13:45'",
		"date -s '2018-12-13 13:45'",
		"systemctl start restic-backups-remotebackup.service",
		"rm /root/backupCleanupCommand",
		"systemctl start restic-backups-rclonebackup.service",

		"timedatectl set-time '2018-12-14 13:45'",
		"date -s '2018-12-14 13:45'",
		"systemctl start restic-backups-remotebackup.service",
		"rm /root/backupCleanupCommand",
		"systemctl start restic-backups-rclonebackup.service",

		"timedatectl set-time '2018-12-15 13:45'",
		"date -s '2018-12-15 13:45'",
		"systemctl start restic-backups-remotebackup.service",
		"rm /root/backupCleanupCommand",
		"systemctl start restic-backups-rclonebackup.service",

		"timedatectl set-time '2018-12-16 13:45'",
		"date -s '2018-12-16 13:45'",
		"systemctl start restic-backups-remotebackup.service",
		"rm /root/backupCleanupCommand",
		"systemctl start restic-backups-rclonebackup.service",

nixos/tests/stub-ld.nix

+0 −17

Original line number	Diff line number	Diff line
		@@ -24,12 +24,6 @@ import ./make-test-python.nix (
		libDir = pkgs.stdenv.hostPlatform.libDir;
		ldsoBasename = lib.last (lib.splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker);

		check32 = pkgs.stdenv.hostPlatform.isx86_64;
		pkgs32 = pkgs.pkgsi686Linux;

		libDir32 = pkgs32.stdenv.hostPlatform.libDir;
		ldsoBasename32 = lib.last (lib.splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker);

		test-exec =
		builtins.mapAttrs
		(
		@@ -45,8 +39,6 @@ import ./make-test-python.nix (
		aarch64-linux.hash = "sha256-hnldbd2cctQIAhIKoEZLIWY8H3jiFBClkNy2UlyyvAs=";
		};
		exec-name = "rustic";

		if32 = pythonStatement: if check32 then pythonStatement else "pass";
		in
		''
		machine.start()
		@@ -54,35 +46,26 @@ import ./make-test-python.nix (

		with subtest("Check for stub (enabled, initial)"):
		machine.succeed('test -L /${libDir}/${ldsoBasename}')
		${if32 "machine.succeed('test -L /${libDir32}/${ldsoBasename32}')"}

		with subtest("Try FHS executable"):
		machine.copy_from_host('${test-exec.${pkgs.stdenv.hostPlatform.system}}','test-exec')
		machine.succeed('if test-exec/${exec-name} 2>outfile; then false; else [ $? -eq 127 ];fi')
		machine.succeed('grep -qi nixos outfile')
		${if32 "machine.copy_from_host('${
		test-exec.${pkgs32.stdenv.hostPlatform.system}
		}','test-exec32')"}
		${if32 "machine.succeed('if test-exec32/${exec-name} 2>outfile32; then false; else [ $? -eq 127 ];fi')"}
		${if32 "machine.succeed('grep -qi nixos outfile32')"}

		with subtest("Disable stub"):
		machine.succeed("/run/booted-system/specialisation/nostub/bin/switch-to-configuration test")

		with subtest("Check for stub (disabled)"):
		machine.fail('test -e /${libDir}/${ldsoBasename}')
		${if32 "machine.fail('test -e /${libDir32}/${ldsoBasename32}')"}

		with subtest("Create file in stub location (to be overwritten)"):
		machine.succeed('mkdir -p /${libDir};touch /${libDir}/${ldsoBasename}')
		${if32 "machine.succeed('mkdir -p /${libDir32};touch /${libDir32}/${ldsoBasename32}')"}

		with subtest("Re-enable stub"):
		machine.succeed("/run/booted-system/bin/switch-to-configuration test")

		with subtest("Check for stub (enabled, final)"):
		machine.succeed('test -L /${libDir}/${ldsoBasename}')
		${if32 "machine.succeed('test -L /${libDir32}/${ldsoBasename32}')"}
		'';
		}
		)

pkgs/applications/radio/pothos/default.nix

+14 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,20 @@ mkDerivation rec {
		./cstring.patch
		];

		postPatch = ''
		substituteInPlace CMakeLists.txt \
		--replace-fail "cmake_minimum_required(VERSION 2.8.9)" "cmake_minimum_required(VERSION 3.10)"
		substituteInPlace spuce/{,spuce}/CMakeLists.txt \
		--replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"

		substituteInPlace spuce/qt_{fir,iir,other,window}/CMakeLists.txt \
		--replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"

		substituteInPlace {audio,blocks,comms,flow,plotters,python,soapy,widgets}/CMakeLists.txt \
		--replace-fail "cmake_minimum_required(VERSION 2.8.9)" "cmake_minimum_required(VERSION 3.10)"

		'';

		# poco 1.14 requires c++17
		NIX_CFLAGS_COMPILE = [ "-std=gnu++17" ];