From 85374e9d6c4693d2a67d1a50803fdc82cda720f6 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Mon, 10 Feb 2025 16:51:43 +0100 Subject: [PATCH] chore(npins): Revert failed update This reverts commit e1c6b1b74941a7f4930b53bcb83e81ad85f6c4ee. --- npins/sources.json | 4 +- patches/default.nix | 6 +++ patches/nixpkgs/06-netbox-qrcode.patch | 70 ++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 patches/nixpkgs/06-netbox-qrcode.patch diff --git a/npins/sources.json b/npins/sources.json index df35cf8..debc08f 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -286,8 +286,8 @@ "nixos-24.11": { "type": "Channel", "name": "nixos-24.11", - "url": "https://releases.nixos.org/nixos/24.11/nixos-24.11.714287.a45fa362d887/nixexprs.tar.xz", - "hash": "1n10rra2j4zfyj12c930dwy2hjyvscgfqalbvf2g7wvmdy4ysm2z" + "url": "https://releases.nixos.org/nixos/24.11/nixos-24.11.713099.67e9c8808988/nixexprs.tar.xz", + "hash": "1i9micd4d0wmmfl9s5zqvpssany2v4s1h3l1lc2pipi3asrgxx0n" }, "nixos-generators": { "type": "Git", diff --git a/patches/default.nix b/patches/default.nix index 5450b4a..2c49d07 100644 --- a/patches/default.nix +++ b/patches/default.nix @@ -22,6 +22,12 @@ 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 new file mode 100644 index 0000000..73bfdc9 --- /dev/null +++ b/patches/nixpkgs/06-netbox-qrcode.patch @@ -0,0 +1,70 @@ +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 { };