carburetor: init at 5.0.0 #309642

mksafavi · 2024-05-06T20:29:35Z

Description of changes

This PR adds carburetor and it's dependency tractor
Closes #308739

Things done

Add a 👍 reaction to pull requests you find important.

Aleksanaa · 2024-06-07T14:12:27Z

I get this error while running it:

Try adding these:

nativeBuildInputs = [
  gobject-introspection # Idk needed or not, try with and without it
  wrapGAppsHook4
];

buildInputs = [
  libadwaita
];

dependencies = [
  # ...
  pygobject3
];

pkgs/by-name/ca/carburetor/package.nix

mksafavi · 2024-06-07T17:42:09Z

Thanks for reviewing this.
I made the changes. now both of the apps get built. 👍
running tractor I get this error:

❯ ./result/bin/tractor start

        Please compile the "tractor.gschema.xml" file.
        In GNU/Linux you can copy it from
        "/nix/store/y4fqc4wbn5ycma7pj6qk835dyg7gkzsb-tractor-4.5.1/lib/python3.11/site-packages/tractor"
        to "/nix/store/a2xf8sr12rcps2175198hhy5n2z3ifl1-gsettings-desktop-schemas-46.0/share/gsettings-schemas/gsettings-desktop-schemas-46.0/glib-2.0/schemas" and run:
        "sudo glib-compile-schemas /nix/store/a2xf8sr12rcps2175198hhy5n2z3ifl1-gsettings-desktop-schemas-46.0/share/gsettings-schemas/gsettings-desktop-schemas-46.0/glib-2.0/schemas"

running carburetor I get this:

❯ ./result-2/bin/carburetor
(process:334322): GLib-GIO-ERROR **: 21:10:44.934: Settings schema 'org.tractor' is not installed
fish: Job 1, './result-2/bin/carburetor' terminated by signal SIGTRAP (Trace or breakpoint trap)

Aleksanaa · 2024-06-07T17:43:45Z

It already tells you what should be done ☺️

Aleksanaa · 2024-07-24T08:31:59Z

pkgs/by-name/ca/carburetor/package.nix

+  pyproject = true;
+
+  src = fetchzip {
+    url = "https://framagit.org/tractor/carburetor/-/archive/${version}/carburetor-${version}.zip";


This instance looks like gitlab. Try fetchFromGitLab,

PerchunPak · 2024-12-22T11:36:35Z

I've got this working!

https://gist.github.com/PerchunPak/ffc206405e219209f1cddde26373de09

Though firefox and chrome don't detect system proxy, but I can reach it with

~ ❯ curl -x "http://localhost:9080" example.com
<html>
<head>
<title>This is an HTTP CONNECT tunnel, not a full HTTP Proxy</title>
</head>
<body>
<h1>This is an HTTP CONNECT tunnel, not an HTTP proxy.</h1>
<p>
It appears you have configured your web browser to use this Tor port as
an HTTP proxy.
</p><p>
This is not correct: This port is configured as a CONNECT tunnel, not
an HTTP proxy. Please configure your client accordingly.  You can also
use HTTPS; then the client should automatically use HTTP CONNECT.</p>
<p>
See <a href="https://www.torproject.org/documentation.html">https://www.torproject.org/documentation.html</a> for more information.
</p>
</body>
</html>

pkgs/by-name/ca/carburetor/package.nix

mksafavi · 2024-12-22T15:27:05Z

I've got this working!

https://gist.github.com/PerchunPak/ffc206405e219209f1cddde26373de09

Though firefox and chrome don't detect system proxy, but I can reach it with

~ ❯ curl -x "http://localhost:9080" example.com
<html>
<head>
<title>This is an HTTP CONNECT tunnel, not a full HTTP Proxy</title>
</head>
<body>
<h1>This is an HTTP CONNECT tunnel, not an HTTP proxy.</h1>
<p>
It appears you have configured your web browser to use this Tor port as
an HTTP proxy.
</p><p>
This is not correct: This port is configured as a CONNECT tunnel, not
an HTTP proxy. Please configure your client accordingly.  You can also
use HTTPS; then the client should automatically use HTTP CONNECT.</p>
<p>
See <a href="https://www.torproject.org/documentation.html">https://www.torproject.org/documentation.html</a> for more information.
</p>
</body>
</html>

Thanks for getting it running 👍
I'll apply your patch.

pkgs/by-name/ca/carburetor/package.nix

PerchunPak · 2024-12-22T16:04:59Z

Don't know what changed, but onion links started working in firefox

mksafavi · 2024-12-22T16:16:04Z

Don't know what changed, but onion links started working in firefox

If you're talking about the latest push, I added the missing tractor patch.

The default bridges couldn't connect on my network. It works on obs4.
In the preferences>Bridges menu there's an option to change the transport type. But you need to manually set the executable file. It might be worth it to patch this as well. snowflake and obfuscated are packaged on nix. but I couldn't find the conjure one.

PerchunPak · 2024-12-22T16:25:51Z

We should avoid patching as much as possible, much better would be

{
  lib,
  ...,
  withObfuscated ? true,
  withSnowflake ? true,
}:
{
  ...
  propagatedBuildInputs =
    [ ]
    ++ lib.optional withObfuscated obfuscated
    ++ lib.optional withSnowflake snowflake;
  ...
}

Oh, this doesn't work, never mind
https://framagit.org/tractor/carburetor/-/blob/main/src/actions.py?ref_type=heads#L304

mksafavi · 2024-12-22T16:50:01Z

We should avoid patching as much as possible, much better would be
{
  lib,
  ...,
  withObfuscated ? true,
  withSnowflake ? true,
}:
{
  ...
  propagatedBuildInputs =
    [ ]
    ++ lib.optional withObfuscated obfuscated
    ++ lib.optional withSnowflake snowflake;
  ...
}
Oh, this doesn't work, never mind https://framagit.org/tractor/carburetor/-/blob/main/src/actions.py?ref_type=heads#L304

I tried adding the packages. but it didn't work.
I checked the tractor dconf options:

('', '', '/nix/store/81ma3inbh5m1qb9kgdbs1hhnaim5r4n2-obfs4-0.4.0/bin/lyrebird', '/usr/bin/snowflake-client', '/usr/bin/conjure-client')

lyrebird is the obs4 exec that I manually added. by default it's looking for the files in /usr/bin

PerchunPak · 2024-12-22T16:54:48Z

Which option is it? Perhaps, we should create a home-manager module for this.

mksafavi · 2024-12-22T17:00:49Z

Which option is it? Perhaps, we should create a home-manager module for this.

It's in org/tractor/pluggable-transport
here's the default value:
https://framagit.org/tractor/tractor/-/blob/main/src/tractor/tractor.gschema.xml?ref_type=heads#L61

PerchunPak · 2025-01-30T09:47:41Z

Why did you remove with* options?

mksafavi · 2025-01-30T09:55:57Z

Why did you remove with* options?

Hi.
I don't know how to use the with options in the postInstall script.

PerchunPak · 2025-01-30T11:13:13Z

Hi. I don't know how to use the with options in the postInstall script.

Just ask

postInstall = ''
  echo 123
''
++ lib.optionalString withSomething ''
  echo I exist only when "something" is enabled!
'';

mksafavi · 2025-01-30T11:27:11Z

Hi. I don't know how to use the with options in the postInstall script.

Just ask
postInstall = ''
  echo 123
''
++ lib.optionalString withSomething ''
  echo I exist only when "something" is enabled!
'';

👍
I did try this first but didn't work. I think the string concat uses a single + sign.
I added the options again.

PerchunPak · 2025-01-30T13:01:56Z

`nixpkgs-review` result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 309642

`x86_64-linux`

✅ 3 packages built:

carburetor
tractor
tractor.dist

`aarch64-linux`

✅ 3 packages built:

carburetor
tractor
tractor.dist

pkgs/by-name/ca/carburetor/package.nix

pkgs/by-name/tr/tractor/package.nix

Tert0

Tested both packages on x86_64-linux.

PerchunPak · 2025-02-02T07:33:15Z

@wegank please stop removing approve labels here, they are real

nixos-discourse · 2025-02-02T07:34:24Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/2228

wegank · 2025-02-02T09:43:21Z

The bot invalidates previous approvals after each push (which is what is happening here), unless the new changes are re-approved by at least one reviewer.

Thatoo · 2025-02-02T11:06:32Z

Could it be backported to 24.11?

nixpkgs-ci · 2025-02-02T11:12:10Z

Successfully created backport PR for release-24.11:

[Backport release-24.11] carburetor: init at 5.0.0 #378784

mksafavi changed the title ~~Pkg/carburetor~~ carburetor: init at 4.5.1 May 6, 2024

ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels May 6, 2024

Aleksanaa reviewed Jun 7, 2024

View reviewed changes

pkgs/by-name/ca/carburetor/package.nix Outdated Show resolved Hide resolved

pkgs/by-name/ca/carburetor/package.nix Outdated Show resolved Hide resolved

mksafavi force-pushed the pkg/carburetor branch from c789bec to 3c091be Compare June 7, 2024 17:41

mksafavi marked this pull request as ready for review June 7, 2024 17:42

Aleksanaa marked this pull request as draft June 22, 2024 14:16

Aleksanaa reviewed Dec 10, 2024

View reviewed changes

PerchunPak reviewed Dec 22, 2024

View reviewed changes

pkgs/by-name/ca/carburetor/package.nix Outdated Show resolved Hide resolved

mksafavi force-pushed the pkg/carburetor branch 2 times, most recently from 342da2c to 6a8d8b0 Compare December 22, 2024 15:17

mksafavi force-pushed the pkg/carburetor branch from 6a8d8b0 to 945c4db Compare December 22, 2024 15:34

mksafavi changed the title ~~carburetor: init at 4.5.1~~ carburetor: init at 5.0.0 Dec 22, 2024

mksafavi marked this pull request as ready for review December 22, 2024 15:35

mksafavi force-pushed the pkg/carburetor branch from 945c4db to 9a96ceb Compare December 22, 2024 15:37

mksafavi commented Dec 22, 2024

View reviewed changes

pkgs/by-name/ca/carburetor/package.nix Show resolved Hide resolved

mksafavi force-pushed the pkg/carburetor branch from 9a96ceb to b7d18fc Compare December 22, 2024 15:55

wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Dec 26, 2024

mksafavi requested a review from getchoo January 8, 2025 11:12

mksafavi force-pushed the pkg/carburetor branch 3 times, most recently from 777dafb to f881e46 Compare January 30, 2025 09:31

mksafavi force-pushed the pkg/carburetor branch from f881e46 to 0043d79 Compare January 30, 2025 11:25

PerchunPak approved these changes Jan 30, 2025

View reviewed changes

PerchunPak added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 30, 2025

Tert0 suggested changes Jan 31, 2025

View reviewed changes

pkgs/by-name/ca/carburetor/package.nix Outdated Show resolved Hide resolved

pkgs/by-name/tr/tractor/package.nix Outdated Show resolved Hide resolved

Tert0 reviewed Jan 31, 2025

View reviewed changes

pkgs/by-name/tr/tractor/package.nix Outdated Show resolved Hide resolved

mksafavi added 2 commits February 1, 2025 13:10

tractor: init at 5.0.0

c0ed932

carburetor: init at 5.0.0

d5af8a0

mksafavi force-pushed the pkg/carburetor branch from 0043d79 to d5af8a0 Compare February 1, 2025 09:41

wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Feb 1, 2025

Tert0 approved these changes Feb 1, 2025

View reviewed changes

PerchunPak added the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Feb 2, 2025

wegank merged commit 9704be1 into NixOS:master Feb 2, 2025
26 of 28 checks passed

mksafavi deleted the pkg/carburetor branch February 2, 2025 09:45

wegank added the backport release-24.11 Backport PR automatically label Feb 2, 2025

nixpkgs-ci bot mentioned this pull request Feb 2, 2025

[Backport release-24.11] carburetor: init at 5.0.0 #378784

Open

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

carburetor: init at 5.0.0 #309642

carburetor: init at 5.0.0 #309642

mksafavi commented May 6, 2024 •

edited

Loading

Aleksanaa commented Jun 7, 2024

mksafavi commented Jun 7, 2024

Aleksanaa commented Jun 7, 2024

Aleksanaa Jul 24, 2024

PerchunPak commented Dec 22, 2024 •

edited

Loading

mksafavi commented Dec 22, 2024

PerchunPak commented Dec 22, 2024

mksafavi commented Dec 22, 2024 •

edited

Loading

PerchunPak commented Dec 22, 2024 •

edited

Loading

mksafavi commented Dec 22, 2024

PerchunPak commented Dec 22, 2024

mksafavi commented Dec 22, 2024 •

edited

Loading

PerchunPak commented Jan 30, 2025

mksafavi commented Jan 30, 2025

PerchunPak commented Jan 30, 2025

mksafavi commented Jan 30, 2025

PerchunPak commented Jan 30, 2025

Tert0 left a comment

PerchunPak commented Feb 2, 2025

nixos-discourse commented Feb 2, 2025

wegank commented Feb 2, 2025

Thatoo commented Feb 2, 2025

nixpkgs-ci bot commented Feb 2, 2025

carburetor: init at 5.0.0 #309642

carburetor: init at 5.0.0 #309642

Conversation

mksafavi commented May 6, 2024 • edited Loading

Description of changes

Things done

Aleksanaa commented Jun 7, 2024

mksafavi commented Jun 7, 2024

Aleksanaa commented Jun 7, 2024

Aleksanaa Jul 24, 2024

Choose a reason for hiding this comment

PerchunPak commented Dec 22, 2024 • edited Loading

mksafavi commented Dec 22, 2024

PerchunPak commented Dec 22, 2024

mksafavi commented Dec 22, 2024 • edited Loading

PerchunPak commented Dec 22, 2024 • edited Loading

mksafavi commented Dec 22, 2024

PerchunPak commented Dec 22, 2024

mksafavi commented Dec 22, 2024 • edited Loading

PerchunPak commented Jan 30, 2025

mksafavi commented Jan 30, 2025

PerchunPak commented Jan 30, 2025

mksafavi commented Jan 30, 2025

PerchunPak commented Jan 30, 2025

nixpkgs-review result

x86_64-linux

aarch64-linux

Tert0 left a comment

Choose a reason for hiding this comment

PerchunPak commented Feb 2, 2025

nixos-discourse commented Feb 2, 2025

wegank commented Feb 2, 2025

Thatoo commented Feb 2, 2025

nixpkgs-ci bot commented Feb 2, 2025

mksafavi commented May 6, 2024 •

edited

Loading

PerchunPak commented Dec 22, 2024 •

edited

Loading

mksafavi commented Dec 22, 2024 •

edited

Loading

PerchunPak commented Dec 22, 2024 •

edited

Loading

mksafavi commented Dec 22, 2024 •

edited

Loading

`nixpkgs-review` result

`x86_64-linux`

`aarch64-linux`