~amjoseph

Western Semiconductor

https://git.sr.ht/~amjoseph/announce

airgap F0B7 4D71 7CDE 8412 A3E0 D4D5 F29A C808 0DA8 E1E0

current D930 411B 675A 011E B959 0713 DC4A B809 B13B E76D

ricochet emhxygy5mezcovm5a6q5hze5eqfqgieww56eh4ttwmrolwqmzgb6qiyd

~amjoseph/ownerboot-discuss

Last active 1 year, 1 month ago

~amjoseph/ownerboot-devel

Last active 1 year, 8 months ago

~amjoseph/ownerboot-announce

Last active 1 year, 8 months ago
View more

Recent activity

Re: [v2] pcsclite, pcsc{-d,tools}: fix cross, {systemd,udev,dbus}Support flags 24 days ago

From Adam Joseph to ~andir/nixpkgs-dev

Quoting Florian Klink (2024-04-19 01:23:23)
> >Note this still causes a lot of rebuilds, probably due to the move of
> >gobject-introspection (?).
> >Are you OK with this simply targeting staging?

Yes of course; sorry about the slow reply.

> As the patches started to not apply anymore, I manually rebased this
> on staging, and sent it out (modulo some formatter fixes) to
> https://github.com/NixOS/nixpkgs/pull/305260.
>
> I'll undraft this PR once I finished building.

I see that you did, and that it was merged.  Thank you so much!

[PATCH 6/6] pcsc-tools: make gui, dbus, and systemd each (independently) optional a month ago

From Adam Joseph to ~andir/nixpkgs-dev

---
 pkgs/tools/security/pcsc-tools/default.nix | 23 ++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/pcsc-tools/default.nix b/pkgs/tools/security/pcsc-tools/default.nix
index c479caa0a613..29d4562d47c5 100644
--- a/pkgs/tools/security/pcsc-tools/default.nix
+++ b/pkgs/tools/security/pcsc-tools/default.nix
@@ -7,8 +7,8 @@
, makeWrapper
, pkg-config
, wrapGAppsHook
, systemd
, dbus
[message trimmed]

[PATCH 5/6] perlPackages.ChipcardPCSC: fix cross a month ago

From Adam Joseph to ~andir/nixpkgs-dev

---
 pkgs/top-level/perl-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index bf073f4b7bcf..38b9aabb6cb8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3312,6 +3312,9 @@ with self; {
      "-Wno-error=implicit-int"
      "-Wno-error=int-conversion"
    ]);
    postPatch = ''
      substituteInPlace Makefile.PL --replace pkg-config $PKG_CONFIG
[message trimmed]

[PATCH 4/6] pcsclite: make udevSupport optional a month ago

From Adam Joseph to ~andir/nixpkgs-dev

This commit allows the use of pcscd on platforms which use mdevd and
libudev-zero instead of systemd-udevd.

When udevd is not running, pcscd needs to link against libusb so that it can
scan the USB busses itself, rather than relying on udevd to do that.
---
 pkgs/tools/security/pcsclite/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index d0160388ca65..93b191c675e0 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -12,6 +12,7 @@
[message trimmed]

[PATCH 3/6] pcsclite: make dbusSupport optional a month ago

From Adam Joseph to ~andir/nixpkgs-dev

---
 pkgs/tools/security/pcsclite/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index 28a19aefa0d9..d0160388ca65 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -10,6 +10,7 @@
, dbus
, polkit
, systemdLibs
, dbusSupport ? stdenv.isLinux
, systemdSupport ? stdenv.isLinux
[message trimmed]

[PATCH 2/6] pcsclite: make systemdSupport optional a month ago

From Adam Joseph to ~andir/nixpkgs-dev

---
 pkgs/tools/security/pcsclite/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index ed5e8163eebc..28a19aefa0d9 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -10,6 +10,7 @@
, dbus
, polkit
, systemdLibs
, systemdSupport ? stdenv.isLinux
, IOKit
[message trimmed]

[PATCH 1/6] pcsclite: remove isLinux condition from --enable-ipcdir configureFlag a month ago

From Adam Joseph to ~andir/nixpkgs-dev

The `--enable-ipcdir=/run/pcscd` flag was added by commit 2b93e96d0bdf5
"pcsclite: add policy kit support".  However the pcscd IPC mechanism is
completely independent from polkit, systemd, and dbus.  There is no reason to
disable the IPC mechanism on all non-Linux platforms.
---
 pkgs/tools/security/pcsclite/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index 956bf451c7bf..ed5e8163eebc 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -37,8 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
    "--enable-usbdropdir=/var/lib/pcsc/drivers"
[message trimmed]

[v2] pcsclite, pcsc{-d,tools}: fix cross, {systemd,udev,dbus}Support flags a month ago

From Adam Joseph to ~andir/nixpkgs-dev

Changes from v1:

1. (Thanks flokli for noticing!): first patch (pcsclite: remove isLinux
   condition from --enable-ipcdir) of previous version would produce undesired
   results (enabled `--with-systemunitdir` everywhere) if applied without the
   second patch in the series.  Fixed in v2.  No change to the result of
   applying the entire series.

2. `pcsclite: make udevSupport optional`: previous series swapped the order of
   two of the buildInputs, which would cause an unnecessary rebuild in the
   common (hydra) case.  This version maintains the original order, so no
   rebuild.

Re: [PATCH 1/6] pcsclite: remove isLinux condition from --enable-ipcdir configureFlag a month ago

From Adam Joseph to ~andir/nixpkgs-dev

Quoting Florian Klink (2024-04-15 08:21:20)
> On 24-04-14 15:42:54, Adam Joseph wrote:
> >-  ] ++ lib.optionals stdenv.isLinux [
> >     "--enable-ipcdir=/run/pcscd"
> >     "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
>           ^--- This now enables this option unconditionally on non-Linux, where there's no systemd.
>                I'd feel more comfortable keeping that option conditionalized still. Or did you verify it still builds on MacOS?

Ah, thanks for noticing this!

The `] ++ lib.optionals stdenv.isLinux [` gets added back in by the next patch
in the series -- this whole series was originally one big patch and I clearly
made a mistake here when splitting it up into separate commits.

[PATCH] s6-linux-init: fix cross compilation a month ago

From Adam Joseph to ~andir/nixpkgs-dev

---
 .../skaware-packages/s6-linux-init/default.nix  | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/skaware-packages/s6-linux-init/default.nix b/pkgs/development/skaware-packages/s6-linux-init/default.nix
index fdb92aa3e2c6..cdb00e78cdd0 100644
--- a/pkgs/development/skaware-packages/s6-linux-init/default.nix
+++ b/pkgs/development/skaware-packages/s6-linux-init/default.nix
@@ -1,4 +1,11 @@
{ lib, skawarePackages, skalibs, execline, s6 }:
{ lib
, stdenv
, skawarePackages
, skalibs
[message trimmed]