Unverified Commit 56e21b73 authored by superherointj's avatar superherointj Committed by GitHub
Browse files

Merge pull request #326368 from dvaerum/patch-1 

cobang: add support for aarch64-linux
parents 804a74e9 c8510e5c

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -5536,6 +5536,12 @@ 
    name = "Duncan Dean";

    keys = [ { fingerprint = "9484 44FC E03B 05BA 5AB0  591E C37B 1C1D 44C7 86EE"; } ];

  };

  dvaerum = {

    email = "nixpkgs-maintainer@varum.dk";

    github = "dvaerum";

    githubId = 6872940;

    name = "Dennis Værum";

  };

  dvn0 = {

    email = "git@dvn.me";

    github = "dvn0";

pkgs/applications/misc/cobang/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@ buildPythonApplication rec { 
    description = "QR code scanner desktop app for Linux";

    homepage = "https://github.com/hongquan/CoBang";

    license = licenses.gpl3Only;

    maintainers = [ ];

    maintainers = with maintainers; [ aleksana dvaerum ];

    mainProgram = "cobang";

    platforms = [ "x86_64-linux" ];

    platforms = lib.platforms.linux;

  };

}

pkgs/development/python-modules/python-zbar/default.nix

+0 −4
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  lib,

  buildPythonPackage,

  fetchFromGitHub,

  pythonAtLeast,

  setuptools,

  pillow,

  zbar,
@@ -14,9 +13,6 @@ buildPythonPackage rec { 
  version = "0.23.93";

  pyproject = true;



  # distutils usage in setup.py

  disabled = pythonAtLeast "3.12";



  src = fetchFromGitHub {

    owner = "mchehab";

    repo = "zbar";