diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-16 18:51:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-16 18:51:05 +0000 |
| commit | f46cb8508278147e8c5adb041d345492c39cf9ae (patch) | |
| tree | 5ce026664e324c75d40950616b6a96171f36bf2f /pkgs/tools/filesystems | |
| parent | 2445824f40799dd72f0120aa3f24b628c400cbf7 (diff) | |
| parent | afc9b7bb5f3d75deaab5dbca7d95d2187f6ef14a (diff) | |
| download | nixlib-f46cb8508278147e8c5adb041d345492c39cf9ae.tar nixlib-f46cb8508278147e8c5adb041d345492c39cf9ae.tar.gz nixlib-f46cb8508278147e8c5adb041d345492c39cf9ae.tar.bz2 nixlib-f46cb8508278147e8c5adb041d345492c39cf9ae.tar.lz nixlib-f46cb8508278147e8c5adb041d345492c39cf9ae.tar.xz nixlib-f46cb8508278147e8c5adb041d345492c39cf9ae.tar.zst nixlib-f46cb8508278147e8c5adb041d345492c39cf9ae.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/bonnie/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/dosfstools/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix index f2ef9a0f52a8..e34e5289ad64 100644 --- a/pkgs/tools/filesystems/bonnie/default.nix +++ b/pkgs/tools/filesystems/bonnie/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { homepage = "http://www.coker.com.au/bonnie++/"; description = "Hard drive and file system benchmark suite"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index a4688ffd4ac5..9efe64f47231 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; homepage = "https://github.com/dosfstools/dosfstools"; - platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.gpl3; }; } |