diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-08-26 00:57:08 -0400 |
---|---|---|
committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-08-26 00:57:08 -0400 |
commit | 262fd63a721dfc2733c55b8db8b8d0881fc5c7c1 (patch) | |
tree | 1729d972da28f35d4614411e151dc3c505451b8c /pkgs/tools/compression | |
parent | b8e97a29cbf75dc0f0fac664a74489ad1fd7f61f (diff) | |
parent | e3cdd952fdcbf2ff6181fd32d69d32a2ccb1daef (diff) |
Merge branch 'master' into staging-next
Conflicts:
pkgs/tools/networking/inetutils/default.nix
Diffstat (limited to 'pkgs/tools/compression')
-rw-r--r-- | pkgs/tools/compression/xdelta/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index ee52f35c9790..fbaab91d0931 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -56,6 +56,6 @@ in stdenv.mkDerivation rec { ''; homepage = "http://xdelta.org/"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } |