From 5ecd26411a2a4f63995f52524c31599afdf439ab Mon Sep 17 00:00:00 2001 From: lucasew Date: Wed, 5 Jun 2024 14:33:04 -0300 Subject: [PATCH 1/2] qrcode: move to by-name, add update script, add lucasew as maintainer Signed-off-by: lucasew --- .../qrcode/default.nix => by-name/qr/qrcode/package.nix} | 6 ++++-- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/{tools/graphics/qrcode/default.nix => by-name/qr/qrcode/package.nix} (81%) diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/by-name/qr/qrcode/package.nix similarity index 81% rename from pkgs/tools/graphics/qrcode/default.nix rename to pkgs/by-name/qr/qrcode/package.nix index e870f53da82e..2b753397244c 100644 --- a/pkgs/tools/graphics/qrcode/default.nix +++ b/pkgs/by-name/qr/qrcode/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, unstableGitUpdater }: stdenv.mkDerivation { pname = "qrcode"; @@ -19,11 +19,13 @@ stdenv.mkDerivation { cp DOCUMENTATION LICENCE "$out/share/doc/qrcode" ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "A small QR-code tool"; homepage = "https://github.com/qsantos/qrcode"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ raskin ]; + maintainers = with maintainers; [ raskin lucasew ]; platforms = with platforms; unix; mainProgram = "qrcode"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16108f9ccc81..963bc98a2450 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33888,8 +33888,6 @@ with pkgs; qpwgraph = qt6Packages.callPackage ../applications/audio/qpwgraph { }; - qrcode = callPackage ../tools/graphics/qrcode { }; - qsampler = libsForQt5.callPackage ../applications/audio/qsampler { }; qscreenshot = libsForQt5.callPackage ../applications/graphics/qscreenshot { }; From 45ae4416ec8cc30d4dfc3ec6f20127066ff3bf35 Mon Sep 17 00:00:00 2001 From: lucasew Date: Wed, 5 Jun 2024 14:34:21 -0300 Subject: [PATCH 2/2] qrcode: unstable-2023-12-02 -> 0-unstable-2024-06-05 Signed-off-by: lucasew --- pkgs/by-name/qr/qrcode/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/qr/qrcode/package.nix b/pkgs/by-name/qr/qrcode/package.nix index 2b753397244c..b7418690a204 100644 --- a/pkgs/by-name/qr/qrcode/package.nix +++ b/pkgs/by-name/qr/qrcode/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "qrcode"; - version = "unstable-2023-12-02"; + version = "0-unstable-2024-06-05"; src = fetchFromGitHub { owner = "qsantos"; repo = "qrcode"; - rev = "96fac69ad3e4f616ce75c0e3ef4ed0574cfab315"; - hash = "sha256-Aesjys6FchB6qcLRWJNGfcEZRlO3stw3+IM8Xe2pF+Q="; + rev = "822923d1b088c58e329c155baa5e5f3e83021947"; + hash = "sha256-e/HnMOcfpGaQkPdp9zww08G4Rc1z0flA2Ghu57kKsQA="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];