-
-
Notifications
You must be signed in to change notification settings - Fork 12.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into HEAD
- Loading branch information
Showing
92 changed files
with
716 additions
and
325 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
{ | ||
timezone-static = import ./make-test.nix ({ pkgs, ... }: { | ||
name = "timezone-static"; | ||
meta.maintainers = with pkgs.lib.maintainers; [ lheckemann ]; | ||
|
||
machine.time.timeZone = "Europe/Amsterdam"; | ||
|
||
testScript = '' | ||
$machine->waitForUnit("dbus.socket"); | ||
$machine->fail("timedatectl set-timezone Asia/Tokyo"); | ||
my @dateResult = $machine->execute('date -d @0 "+%Y-%m-%d %H:%M:%S"'); | ||
$dateResult[1] eq "1970-01-01 01:00:00\n" or die "Timezone seems to be wrong"; | ||
''; | ||
}); | ||
|
||
timezone-imperative = import ./make-test.nix ({ pkgs, ... }: { | ||
name = "timezone-imperative"; | ||
meta.maintainers = with pkgs.lib.maintainers; [ lheckemann ]; | ||
|
||
machine.time.timeZone = null; | ||
|
||
testScript = '' | ||
$machine->waitForUnit("dbus.socket"); | ||
# Should default to UTC | ||
my @dateResult = $machine->execute('date -d @0 "+%Y-%m-%d %H:%M:%S"'); | ||
print $dateResult[1]; | ||
$dateResult[1] eq "1970-01-01 00:00:00\n" or die "Timezone seems to be wrong"; | ||
$machine->succeed("timedatectl set-timezone Asia/Tokyo"); | ||
# Adjustment should be taken into account | ||
my @dateResult = $machine->execute('date -d @0 "+%Y-%m-%d %H:%M:%S"'); | ||
print $dateResult[1]; | ||
$dateResult[1] eq "1970-01-01 09:00:00\n" or die "Timezone was not adjusted"; | ||
# Adjustment should persist across a reboot | ||
$machine->shutdown; | ||
$machine->waitForUnit("dbus.socket"); | ||
my @dateResult = $machine->execute('date -d @0 "+%Y-%m-%d %H:%M:%S"'); | ||
print $dateResult[1]; | ||
$dateResult[1] eq "1970-01-01 09:00:00\n" or die "Timezone adjustment was not persisted"; | ||
''; | ||
}); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
{ stdenv, fetchurl }: | ||
|
||
stdenv.mkDerivation rec { | ||
version = "3.3"; | ||
name = "xtermcontrol-${version}"; | ||
|
||
src = fetchurl { | ||
url = "http://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz"; | ||
sha256 = "1v2c1cnx43apmspga7icssh5ndbhzy5h82y6vm8fda40flq9mxj5"; | ||
}; | ||
|
||
meta = { | ||
description = "Enables dynamic control of xterm properties"; | ||
longDescription = '' | ||
Enables dynamic control of xterm properties. | ||
It makes it easy to change colors, title, font and geometry of a running xterm, as well as to report the current settings of these properties. | ||
Window manipulations de-/iconify, raise/lower, maximize/restore and reset are also supported. | ||
To complete the feature set; xtermcontrol lets advanced users issue any xterm control sequence of their choosing. | ||
''; | ||
homepage = http://thrysoee.dk/xtermcontrol; | ||
license = stdenv.lib.licenses.gpl2; | ||
platforms = stdenv.lib.platforms.unix; | ||
maintainers = [ stdenv.lib.maintainers.derchris ]; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.