summaryrefslogtreecommitdiffstats
path: root/nixos
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-01-03 00:56:46 +0000
committerGitHub <noreply@github.com>2021-01-03 00:56:46 +0000
commitbc30d1eb34b516e94acbc9cf08e39adab5d2950f (patch)
tree59e6a47374f96570fe71a7241cc9d2b595413c76 /nixos
parent67638a5bec853aacc992ecf60ae5b5344ade7c42 (diff)
parentc1149a77c1446fdcbdae5f2135dc40124a1afb8f (diff)
Merge master into staging-next
Diffstat (limited to 'nixos')
-rw-r--r--nixos/doc/manual/release-notes/rl-2103.xml8
-rw-r--r--nixos/tests/all-tests.nix1
-rw-r--r--nixos/tests/git/hub.nix17
3 files changed, 26 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index e1638e8b7469..fc8f1e2b85a2 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -169,6 +169,14 @@
</para>
</listitem>
<listitem>
+ <para>
+ xfsprogs was update from 4.19 to 5.10. It now enables reflink support by default on filesystem creation.
+ Support for reflinks was added with an experimental status to kernel 4.9 and deemed stable in kernel 4.16.
+ If you want to be able to mount XFS filesystems created with this release of xfsprogs on kernel releases older than those, you need to format them
+ with <literal>mkfs.xfs -m reflink=0</literal>.
+ </para>
+ </listitem>
+ <listitem>
<para>
<package>btc1</package> has been abandoned upstream, and removed.
</para>
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 659e538b31d0..c491b559213c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -158,6 +158,7 @@ in
home-assistant = handleTest ./home-assistant.nix {};
hostname = handleTest ./hostname.nix {};
hound = handleTest ./hound.nix {};
+ hub = handleTest ./git/hub.nix {};
hydra = handleTest ./hydra {};
i3wm = handleTest ./i3wm.nix {};
icingaweb2 = handleTest ./icingaweb2.nix {};
diff --git a/nixos/tests/git/hub.nix b/nixos/tests/git/hub.nix
new file mode 100644
index 000000000000..e2359e887efb
--- /dev/null
+++ b/nixos/tests/git/hub.nix
@@ -0,0 +1,17 @@
+import ../make-test-python.nix ({ pkgs, ...} : {
+ name = "hub";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ nequissimus ];
+ };
+
+ nodes.hub = { pkgs, ... }:
+ {
+ environment.systemPackages = [ pkgs.gitAndTools.hub ];
+ };
+
+ testScript =
+ ''
+ assert "git version ${pkgs.git.version}\nhub version ${pkgs.gitAndTools.hub.version}\n" in hub.succeed("hub version")
+ assert "These GitHub commands are provided by hub" in hub.succeed("hub help")
+ '';
+})