From 0243b21cceefc09a8539682ac23503c1962d85bd Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@dgnum.eu>
Date: Thu, 23 Jan 2025 12:59:36 +0100
Subject: [PATCH] fix(patches): Remove changes included upstream
---
patches/default.nix | 6 ---
patches/nixpkgs/06-netbox-qrcode.patch | 70 --------------------------
2 files changed, 76 deletions(-)
delete mode 100644 patches/nixpkgs/06-netbox-qrcode.patch
diff --git a/patches/default.nix b/patches/default.nix
index 2c49d07..5450b4a 100644
--- a/patches/default.nix
+++ b/patches/default.nix
@@ -22,12 +22,6 @@ in
# Crabfit: don't depend on all google-fonts
(local ./nixpkgs/03-crabfit-karla.patch)
- # netbox qrcode plugin
- (local ./nixpkgs/06-netbox-qrcode.patch)
-
- # Fix pretix tests
- (npr 374822 "sha256-vM6l8Pb6F5HoZrpG4Ay3DdwwHBbv8MQy2Bo4gfiQ5zM=")
-
# pretalx env file option
(local ./nixpkgs/01-pretalx-environment-file.patch)
diff --git a/patches/nixpkgs/06-netbox-qrcode.patch b/patches/nixpkgs/06-netbox-qrcode.patch
deleted file mode 100644
index 73bfdc9..0000000
--- a/patches/nixpkgs/06-netbox-qrcode.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/pkgs/development/python-modules/netbox-qrcode/default.nix b/pkgs/development/python-modules/netbox-qrcode/default.nix
-new file mode 100644
-index 000000000000..b378b839a8dc
---- /dev/null
-+++ b/pkgs/development/python-modules/netbox-qrcode/default.nix
-@@ -0,0 +1,51 @@
-+{ lib
-+, buildPythonPackage
-+, fetchFromGitHub
-+, setuptools
-+, wheel
-+, pillow
-+, qrcode
-+, netbox
-+}:
-+
-+buildPythonPackage rec {
-+ pname = "netbox-qrcode";
-+ version = "0.0.13";
-+ pyproject = true;
-+
-+ src = fetchFromGitHub {
-+ owner = "netbox-community";
-+ repo = "netbox-qrcode";
-+ rev = "v${version}";
-+ hash = "sha256-/labSZyB1SkU/uemuL946RDk8IVEAgCYJY2vrJFney0=";
-+ };
-+
-+ nativeBuildInputs = [
-+ setuptools
-+ wheel
-+ ];
-+
-+ propagatedBuildInputs = [
-+ qrcode
-+ pillow
-+ ];
-+
-+ checkInputs = [
-+ netbox
-+ ];
-+
-+ preFixup = ''
-+ export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH
-+ '';
-+
-+ pythonImportsCheck = [
-+ "netbox_qrcode"
-+ ];
-+
-+ meta = with lib; {
-+ description = "NetBox Plugin for generate QR Codes";
-+ homepage = "https://github.com/netbox-community/netbox-qrcode";
-+ license = licenses.asl20;
-+ maintainers = with maintainers; [ sinavir ];
-+ };
-+}
-diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
-index 9999d745e3ac..b226e0063672 100644
---- a/pkgs/top-level/python-packages.nix
-+++ b/pkgs/top-level/python-packages.nix
-@@ -8989,6 +8989,8 @@ self: super: with self; {
-
- netbox-reorder-rack = callPackage ../development/python-modules/netbox-reorder-rack { };
-
-+ netbox-qrcode = callPackage ../development/python-modules/netbox-qrcode { };
-+
- netcdf4 = callPackage ../development/python-modules/netcdf4 { };
-
- netdata = callPackage ../development/python-modules/netdata { };