From f92bb6938fc791d16c5d68a0a86aaf4e0c2ba768 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 10 Nov 2024 15:58:55 +0800 Subject: [PATCH 1/3] pflask: nixfmt --- pkgs/by-name/pf/pflask/package.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pf/pflask/package.nix b/pkgs/by-name/pf/pflask/package.nix index 53ed1e5a342c..3ca204b709c8 100644 --- a/pkgs/by-name/pf/pflask/package.nix +++ b/pkgs/by-name/pf/pflask/package.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, python3, wafHook }: +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + python3, + wafHook, +}: stdenv.mkDerivation rec { pname = "pflask"; @@ -21,7 +28,10 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ python3 wafHook ]; + nativeBuildInputs = [ + python3 + wafHook + ]; postInstall = '' mkdir -p $out/bin From bfa332cb9fc1e7ff45608ef1cdf94f5e20ac9d28 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 10 Nov 2024 15:59:55 +0800 Subject: [PATCH 2/3] pflask: add bot-wxt1221 as maintainers --- pkgs/by-name/pf/pflask/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pf/pflask/package.nix b/pkgs/by-name/pf/pflask/package.nix index 3ca204b709c8..1596498cd9ac 100644 --- a/pkgs/by-name/pf/pflask/package.nix +++ b/pkgs/by-name/pf/pflask/package.nix @@ -7,13 +7,13 @@ wafHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation ({ pname = "pflask"; version = "unstable-2018-01-23"; src = fetchFromGitHub { owner = "ghedo"; - repo = pname; + repo = "pflask"; rev = "9ac31ffe2ed29453218aac89ae992abbd6e7cc69"; hash = "sha256-bAKPUj/EipZ98kHbZiFZZI3hLVMoQpCrYKMmznpSDhg="; }; @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { homepage = "https://ghedo.github.io/pflask/"; license = lib.licenses.bsd2; platforms = lib.platforms.linux; - maintainers = [ ]; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; }; -} +}) From 797b0cd53a05561bb3a401524bff9e4e13fefef7 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 10 Nov 2024 16:00:44 +0800 Subject: [PATCH 3/3] pflask: pin to python311 --- pkgs/by-name/pf/pflask/package.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pf/pflask/package.nix b/pkgs/by-name/pf/pflask/package.nix index 1596498cd9ac..f823d49201f8 100644 --- a/pkgs/by-name/pf/pflask/package.nix +++ b/pkgs/by-name/pf/pflask/package.nix @@ -5,9 +5,10 @@ fetchpatch, python3, wafHook, + waf, }: -stdenv.mkDerivation ({ +stdenv.mkDerivation (finalAttrs: { pname = "pflask"; version = "unstable-2018-01-23"; @@ -28,9 +29,20 @@ stdenv.mkDerivation ({ }) ]; + waf-version = "2.0.27"; + nativeBuildInputs = [ python3 - wafHook + (wafHook.override { + waf = waf.overrideAttrs (old: { + version = finalAttrs.waf-version; + src = fetchFromGitHub { + inherit (old.src) owner repo; + rev = "waf-${finalAttrs.waf-version}"; + hash = "sha256-GeEoD5CHubwR4ndGk7J7czEf0hWtPQr88TqJDPqeK0s="; + }; + }); + }) ]; postInstall = ''