diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-10 00:02:22 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-10 00:02:22 +0000 |
commit | 3f616fad02c82853a8e6e3cf8fd3aea95945f70e (patch) | |
tree | 13ae002b9f9ee17c56db234f89ae5585b505b16c /pkgs/development/libraries | |
parent | e112f9b8bbb5af9de4426046a7cb4490e2c12eb0 (diff) | |
parent | 2251d8ffde6ad42897b7c97c51e117a2c6ec7f23 (diff) | |
download | nixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar nixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar.gz nixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar.bz2 nixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar.lz nixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar.xz nixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar.zst nixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/vxl/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 098dc64cf15..941e07a27e3 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { meta = { description = "C++ Libraries for Computer Vision Research and Implementation"; homepage = "https://vxl.sourceforge.net/"; - license = "VXL License"; + # license appears contradictory; see https://github.com/vxl/vxl/issues/752 + # (and see https://github.com/InsightSoftwareConsortium/ITK/pull/1920/files for potential patch) + license = [ lib.licenses.unfree ]; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; }; |