diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-08 02:07:34 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-08 02:07:34 +0100 |
| commit | e6c0c98940bc72280216639cd9fb16745b7e1103 (patch) | |
| tree | 365c0fb567ff279f2475445a8ba001776629df0e /pkgs/tools/filesystems | |
| parent | 5c072a088d7b0efd3a8185953fe21efcd6c1d94a (diff) | |
| parent | 9414948a5a19463acce5a7f2b2206c39ecb6359f (diff) | |
| download | nixlib-e6c0c98940bc72280216639cd9fb16745b7e1103.tar nixlib-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.gz nixlib-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.bz2 nixlib-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.lz nixlib-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.xz nixlib-e6c0c98940bc72280216639cd9fb16745b7e1103.tar.zst nixlib-e6c0c98940bc72280216639cd9fb16745b7e1103.zip | |
Merge branch 'master' into staging-next
zynaddsubfx conflict has been updated to 3.0.1, which conflicted with rewrite after 3.0.5 update on a different branch.
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/ceph/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 7a9809bdfc2e..7f6acca39705 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -81,7 +81,7 @@ let inherit description; license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; maintainers = with maintainers; [ adev ak johanot krav ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; ceph-common = python3Packages.buildPythonPackage rec{ |