From dc819a20684e68f94271c8431c3af1a3d311ef07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20Vestergaard=20V=C3=A6rum?= Date: Fri, 2 Aug 2024 01:13:17 +0200 Subject: [PATCH 1/3] maintainers: add dvaerum --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 35ee264175a0..a886d93ae701 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -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"; From d92725b02953d45c502a04e9b5b29c88cb00f0ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20Vestergaard=20V=C3=A6rum?= Date: Fri, 2 Aug 2024 01:52:58 +0200 Subject: [PATCH 2/3] python312Packages.python-zbar: fix build --- pkgs/development/python-modules/python-zbar/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/python-zbar/default.nix b/pkgs/development/python-modules/python-zbar/default.nix index ed676f9c3561..64dba8c8d350 100644 --- a/pkgs/development/python-modules/python-zbar/default.nix +++ b/pkgs/development/python-modules/python-zbar/default.nix @@ -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"; From c8510e5cf20bcd35783ef0935fbbbdd2a2a670d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20V=C3=A6rum?= <6872940+dvaerum@users.noreply.github.com> Date: Wed, 31 Jul 2024 17:19:21 +0200 Subject: [PATCH 3/3] cobang: set `platform` to support `lib.platforms.linux` I have built cobang on the architecture `aarch64-linux` and it works for me. Since the program is written in python I will assume that it will work on all Linux architectures so I have set `platform` to support `lib.platforms.linux` --- pkgs/applications/misc/cobang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix index 0aca420fc7a4..e20bf9b818ad 100644 --- a/pkgs/applications/misc/cobang/default.nix +++ b/pkgs/applications/misc/cobang/default.nix @@ -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; }; }