~flokli

[::]

Recent activity

Re: [RESEND] [PATCH] default-crate-overrides: proc-macro-crate assumes env::var("CARGO") a month ago

From Florian Klink to ~andir/nixpkgs-dev

Don't know what your rebased against, certainly not after
0c00ad14acbef5f64476b473e9ba035ad504d3a1, but it still didn't apply.

I now manually applied the patch and sent out
https://github.com/NixOS/nixpkgs/pull/336704.

On Thu, Aug 22, 2024 at 01:28:15PM GMT, Adam Joseph wrote:
>Since version 2.0.0, proc-macro-crate has assumed it can exec()
>`env::var("CARGO")` in order to run `cargo locate-project`.
>
>This commit adds a crate override to proc-macro-crate which simply writes the
>path to buildPlatform.cargo into the proc-macro-crate sources.
>
>This way we don't need to set `env.CARGO` for every build that depends on

Re: [PATCH] default-crate-overrides: proc-macro-crate assumes env::var("CARGO") a month ago

From Florian Klink to ~andir/nixpkgs-dev

Hey,

On Mon, Aug 19, 2024 at 10:57:03AM GMT, Adam Joseph wrote:
>Since version 2.0.0, proc-macro-crate has assumed it can exec()
>`env::var("CARGO")` in order to run `cargo locate-project`.
>
>This commit adds a crate override to proc-macro-crate which simply writes the
>path to buildPlatform.cargo into the proc-macro-crate sources.
>
>This way we don't need to set `env.CARGO` for every build that depends on
>proc-macro-crate -- if we do that, the $CARGO environment variable would be
>visible to the entire build.  This could potentially lead to incredibly
>hard-to-troubleshoot heisenbugs if there is some other crate that expects
>`env::var("CARGO")` to exist -- that other crate would mysteriously work only

Re: [PATCH] fetchYarnDeps: fix broken fetching logic for github releases 2 months ago

From Florian Klink to ~andir/nixpkgs-dev

https://github.com/NixOS/nixpkgs/pull/329863

On Wed, Jul 24, 2024 at 03:01:12PM GMT, Adam Joseph wrote:
>When a dependency references a github *release* URL, that dependency must be
>fetched using https rather than git, since github does not require that
>release tarballs have any relationship whatsoever to the git history.
>
>This commit causes them to be fetched using https, not git.
>
>A test case (which fails prior to this commit, and passes afterwards) is included.
>---
> pkgs/build-support/node/fetch-yarn-deps/index.js         | 9 ++++++---
> .../build-support/node/fetch-yarn-deps/tests/default.nix | 4 ++++
> .../node/fetch-yarn-deps/tests/github-release.lock       | 6 ++++++

Re: [PATCH] fetch-yarn-deps: improve diagnostic messages 2 months ago

From Florian Klink to ~andir/nixpkgs-dev

https://github.com/NixOS/nixpkgs/pull/329863

On Wed, Jul 24, 2024 at 02:59:35PM GMT, Adam Joseph wrote:
>When the hash of an url being fetched does not match the expected value, this
>commit will cause fetch-yarn-deps to include the url in the error message to
>assist debugging.
>---
> pkgs/build-support/node/fetch-yarn-deps/index.js | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/pkgs/build-support/node/fetch-yarn-deps/index.js b/pkgs/build-support/node/fetch-yarn-deps/index.js
>index e60fdeb54330..91e3d1014661 100755
>--- a/pkgs/build-support/node/fetch-yarn-deps/index.js
>+++ b/pkgs/build-support/node/fetch-yarn-deps/index.js

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

From Florian Klink to ~andir/nixpkgs-dev

On Tue, Apr 16, 2024 at 10:57:24PM +0300, Florian Klink wrote:
>I tried building `pkgsCross.aarch64-multiplatform.pcsc-tools` from
>a `x86_64-linux` system.
>
>At least on master, there was a cross regression for gnupg (which I hit
>when building pcsc-tools with systemd support, as systemd (or importd more
>specifically) uses gnupg.
>
>Though if I disable that, it successfully builds, it's unrelated to
>your patchset anyways (and maybe fixed in staging, didn't check).
>
>On Mon, Apr 15, 2024 at 01:09:16PM -0700, Adam Joseph wrote:
>>Changes from v1:
>>

Re: [PATCH 2/2] ricochet-irc: init at 3.0.11.2 5 months ago

From Florian Klink to ~andir/nixpkgs-dev

On Thu, Apr 18, 2024 at 04:44:15PM +0200, sternenseemann wrote:
>
>
>On 4/15/24 01:11, Adam Joseph wrote:
>>+  src = (fetchFromGitHub {
>>+    owner = "wfr";
>>+    repo = "ricochet-irc";
>>+    rev = "irc-v${finalAttrs.version}";
>>+    sha256 = "sha256-hN2XaKGurPVx1rbfBPFvvOYyh1CuPFfycPee/MGrkak=";
>>+    fetchSubmodules = false;
>>+    forceFetchGit = true;
>>+  }).overrideAttrs (previousAttrs: {
>>+    env = (previousAttrs.env or {}) // {
>>+      # We need to fetch the `src/extern/tor` git submodule, but it

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

From Florian Klink to ~andir/nixpkgs-dev

I tried building `pkgsCross.aarch64-multiplatform.pcsc-tools` from
a `x86_64-linux` system.

At least on master, there was a cross regression for gnupg (which I hit
when building pcsc-tools with systemd support, as systemd (or importd more
specifically) uses gnupg.

Though if I disable that, it successfully builds, it's unrelated to
your patchset anyways (and maybe fixed in staging, didn't check).

On Mon, Apr 15, 2024 at 01:09:16PM -0700, Adam Joseph wrote:
>Changes from v1:
>
>1. (Thanks flokli for noticing!): first patch (pcsclite: remove isLinux

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

From Florian Klink to ~andir/nixpkgs-dev

On 24-04-14 15:42:54, Adam Joseph wrote:
>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 | 1 -
> 1 file changed, 1 deletion(-)
>
>diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
>index 956bf451c7bf..44a045f1fa49 100644
>--- a/pkgs/tools/security/pcsclite/default.nix
>+++ b/pkgs/tools/security/pcsclite/default.nix
>@@ -37,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: {

Re: [PATCH] git: Tell users how to install removed sub-commands 3 years ago

From Florian Klink to ~andir/nixpkgs-dev

On 20-12-16 15:50:03, Klemens Nanni wrote:
>On Tue, Nov 24, 2020 at 07:06:35PM +0100, Florian Klink wrote:
>> But yeah, no need to re-roll the patch if you don't want to, let's give
>> this some more testing first.
>Is there any chance you've carried out "some more testing" by now?

I didn't do some testing, and currently don't have the bandwidth to do
so. This should be made more visible to the broader community (through a
PR, and a post in discourse for example).

>Would it be possible for you to open a PR with this change?
>Sadly enough, it seems the community is not yet interested in alternative
>ways of contribution.

Re: [PATCH] git: Tell users how to install removed sub-commands 3 years ago

From Florian Klink to ~andir/nixpkgs-dev

>> s/install nixos.gitFull instead/use nixos.gitFull instead/, otherwise
>> LGTM. Haven't tested it yet, though.
>*User has "git" installed, sees the error and decides to do a one-off to
>for git-send-email(1) instead of switching permanently*:
>
>	$ nix-shell -p gitFull --run 'git send-email ...'
>
>Does that count as installation or usage?  I think either is fine but
>only the latter includes the former;  I'll gladly send an updated and
>final diff if need be to avoid bike-shedding once overall consensus is
>reached but will avoid such churn for now.

This is a usage, not an installation, "installing" is very much
understood to be "adding it to your profile, either by changing the