libproxy: 0.4.18 -> 0.5.3 by SuperSandro2000 · Pull Request #272353 · NixOS/nixpkgs

SuperSandro2000 · 2023-12-05T21:19:40Z

Description of changes

Things done

Add a 👍 reaction to pull requests you find important.

pkgs/development/libraries/libproxy/default.nix

jtojnar · 2023-12-06T09:08:34Z

pkgs/development/libraries/libproxy/default.nix

If this still looks for GNOME settings, either a wrapper or patch (see makeHardcodeGsettingsPatch) will still be necessary.

pxgsettings no longer exists.

😒 libproxy/libproxy@3e06882

The new location seems to be https://github.com/libproxy/libproxy/tree/main/src/backend/plugins/config-gnome .

No idea if we need to wrap the proxy binary instead.

proxy program is just a test tool so wrapping it will not help. Looks like the backends are all compiled into libpxbackend.

The only option is patching it as in #271037

So, do we now wait for that PR or just hope people wrap?

That PR only affects GTK. I meant is as an example what would have to be done here if we do not want even more wrappers everywhere.

I have no experience with C/C++, so that would need to be done by someone else.

I have pushed a patch + update script to update it (depends on #276828). The patch is suboptimal for now (the source is created multiple times) but at least it can be generated automatically.

pkgs/development/libraries/libproxy/default.nix

SuperSandro2000 · 2024-01-14T18:16:56Z

Just rebased the PR. I am not sure what needs to be done to merge this.

jtojnar · 2024-01-20T16:19:11Z

We should probably check that it still works.

Also it needs to target staging.

SuperSandro2000 · 2024-01-24T13:36:14Z

We should probably check that it still works.

I am not using gnome :/

but targeted staging

jtojnar · 2024-01-24T21:16:19Z

I tried the following test case, which revealed the patch was insufficient (there was schema presence check which was not handled) so I pushed a fix.

Unfortunately, it still returns direct:// no matter what I tried.

let
  pkgs = import ./. { };

  testSrc = pkgs.writeText "test.py" ''
    import gi
    gi.require_version('Libproxy', '1.0')
    from gi.repository import Libproxy

    url = 'https://github.com/libproxy/libproxy'

    pf = Libproxy.ProxyFactory()
    proxies = pf.get_proxies(url)
    print(proxies)
  '';
in
pkgs.runCommand
  "libproxy-test"
  {
    nativeBuildInputs = [
      pkgs.glib
      pkgs.gobject-introspection # For setup hook
    ];

    buildInputs = [
      (pkgs.python3.withPackages (pp: [
        pp.pygobject3
      ]))
      pkgs.libproxy
    ];
  }
  ''
    export HOME=$(mktemp -d)
    export XDG_CURRENT_DESKTOP=GNOME
    python3 "${testSrc}"
    (
      export XDG_DATA_DIRS=${pkgs.glib.getSchemaDataDirPath pkgs.gsettings-desktop-schemas}
      gsettings set org.gnome.system.proxy mode manual
      gsettings set org.gnome.system.proxy.http host localhost
      gsettings set org.gnome.system.proxy.https host localhost
      gsettings set org.gnome.system.proxy.https port 8080

      # was it set correctly?
      gsettings get org.gnome.system.proxy mode
      gsettings get org.gnome.system.proxy.http host
      gsettings get org.gnome.system.proxy.http port
      gsettings get org.gnome.system.proxy.https host
      gsettings get org.gnome.system.proxy.https port
    )

    # was it written?
    cat ~/.config/glib-2.0/settings/keyfile

    GSETTINGS_BACKEND=keyfile python3 "${testSrc}"

    # touch "$out"
  ''

jtojnar · 2024-01-27T15:15:31Z

Looks like my test is failing just because there is no network connection in the sandbox. If I run the updated test case on my live system, it detects proxy correctly:

$ gsettings set org.gnome.system.proxy mode manual
$ gsettings set org.gnome.system.proxy.http host localhost
$ gsettings set org.gnome.system.proxy.https host localhost
$ gsettings set org.gnome.system.proxy.https port 8080
$ PX_DEBUG=1 result/test
(process:137180): pxbackend-DEBUG: 16:03:16.330: px_config_sysconfig_set_config_file: Could not read file /etc/sysconfig/proxy
(process:137180): pxbackend-DEBUG: 16:03:16.330: Active config plugins:
(process:137180): pxbackend-DEBUG: 16:03:16.330:  - config-env
(process:137180): pxbackend-DEBUG: 16:03:16.330:  - config-kde
(process:137180): pxbackend-DEBUG: 16:03:16.330:  - config-gnome
(process:137180): pxbackend-DEBUG: 16:03:16.330:  - config-sysconfig
(process:137180): pxbackend-DEBUG: 16:03:16.334: px_manager_on_network_changed: Network connection changed, clearing pac data
(process:137180): pxbackend-DEBUG: 16:03:16.334: px_manager_constructed: Up and running
(process:137180): pxbackend-DEBUG: 16:03:16.334: px_manager_get_proxies_sync: url=https://github.com/libproxy/libproxy online=1
(process:137180): pxbackend-DEBUG: 16:03:16.334: px_manager_get_proxies_sync: Config[0] = http://localhost:8080
(process:137180): pxbackend-DEBUG: 16:03:16.334: px_manager_get_proxies_sync: Proxy[0] = http://localhost:8080
['http://localhost:8080']
(process:137180): pxbackend-DEBUG: 16:03:16.336: px_config_sysconfig_set_config_file: Could not read file /etc/sysconfig/proxy
(process:137180): pxbackend-DEBUG: 16:03:16.336: Active config plugins:
(process:137180): pxbackend-DEBUG: 16:03:16.336:  - config-env
(process:137180): pxbackend-DEBUG: 16:03:16.336:  - config-kde
(process:137180): pxbackend-DEBUG: 16:03:16.336:  - config-gnome
(process:137180): pxbackend-DEBUG: 16:03:16.336:  - config-sysconfig
(process:137180): pxbackend-DEBUG: 16:03:16.338: px_manager_on_network_changed: Network connection changed, clearing pac data
(process:137180): pxbackend-DEBUG: 16:03:16.338: px_manager_constructed: Up and running

And if I disconnect from network, it will fail on my live system the same way as the sandbox:

$ PX_DEBUG=1 result/test
(process:136949): pxbackend-DEBUG: 16:03:01.921: px_config_sysconfig_set_config_file: Could not read file /etc/sysconfig/proxy
(process:136949): pxbackend-DEBUG: 16:03:01.921: Active config plugins:
(process:136949): pxbackend-DEBUG: 16:03:01.921:  - config-env
(process:136949): pxbackend-DEBUG: 16:03:01.921:  - config-kde
(process:136949): pxbackend-DEBUG: 16:03:01.921:  - config-gnome
(process:136949): pxbackend-DEBUG: 16:03:01.921:  - config-sysconfig
(process:136949): pxbackend-DEBUG: 16:03:01.924: px_manager_on_network_changed: Network connection changed, clearing pac data
(process:136949): pxbackend-DEBUG: 16:03:01.924: px_manager_constructed: Up and running
(process:136949): pxbackend-DEBUG: 16:03:01.924: px_manager_get_proxies_sync: url=https://github.com/libproxy/libproxy online=0
['direct://']
(process:136949): pxbackend-DEBUG: 16:03:01.926: px_config_sysconfig_set_config_file: Could not read file /etc/sysconfig/proxy
(process:136949): pxbackend-DEBUG: 16:03:01.926: Active config plugins:
(process:136949): pxbackend-DEBUG: 16:03:01.926:  - config-env
(process:136949): pxbackend-DEBUG: 16:03:01.926:  - config-kde
(process:136949): pxbackend-DEBUG: 16:03:01.926:  - config-gnome
(process:136949): pxbackend-DEBUG: 16:03:01.926:  - config-sysconfig
(process:136949): pxbackend-DEBUG: 16:03:01.927: px_manager_on_network_changed: Network connection changed, clearing pac data
(process:136949): pxbackend-DEBUG: 16:03:01.927: px_manager_constructed: Up and running

Updated test case

let
  pkgs = import <nixpkgs> { };

  testSrc = pkgs.writeText "test.py" ''
    #!/usr/bin/env python3
    import gi
    gi.require_version('Libproxy', '1.0')
    from gi.repository import Libproxy

    url = 'https://github.com/libproxy/libproxy'

    pf = Libproxy.ProxyFactory()
    proxies = pf.get_proxies(url)
    print(proxies)
  '';
in
pkgs.runCommand
  "libproxy-test"
  {
    nativeBuildInputs = [
      pkgs.glib
      pkgs.makeWrapper
      pkgs.gobject-introspection # For setup hook
    ];

    buildInputs = [
      (pkgs.python3.withPackages (pp: [
        pp.pygobject3
      ]))
      pkgs.libproxy
    ];
  }
  ''
    export HOME=$(mktemp -d)
    export GSETTINGS_BACKEND=keyfile
    export PX_DEBUG=1
    export XDG_CURRENT_DESKTOP=GNOME
    python3 "${testSrc}"
    (
      export XDG_DATA_DIRS=${pkgs.glib.getSchemaDataDirPath pkgs.gsettings-desktop-schemas}
      gsettings set org.gnome.system.proxy mode manual
      gsettings set org.gnome.system.proxy.http host localhost
      gsettings set org.gnome.system.proxy.https host localhost
      gsettings set org.gnome.system.proxy.https port 8080

      # was it set correctly?
      gsettings get org.gnome.system.proxy mode
      gsettings get org.gnome.system.proxy.http host
      gsettings get org.gnome.system.proxy.http port
      gsettings get org.gnome.system.proxy.https host
      gsettings get org.gnome.system.proxy.https port
    )

    # was it written?
    cat ~/.config/glib-2.0/settings/keyfile

    # python3 "${testSrc}"

    mkdir -p "$out"
    cp "${testSrc}" "$out/test"
    chmod +x "$out/test"
    patchShebangs --host "$out/test"
    wrapProgram "$out/test" --prefix "GI_TYPELIB_PATH" ":" "${pkgs.libproxy}/lib/girepository-1.0"
  ''

And reset the settings with:

gsettings reset org.gnome.system.proxy mode
gsettings reset org.gnome.system.proxy.http host
gsettings reset org.gnome.system.proxy.https host
gsettings reset org.gnome.system.proxy.https port

jtojnar · 2024-01-27T15:22:09Z

I have rebased and enabled tests. I think it is now good to merge.

jtojnar · 2024-04-11T09:16:49Z

@SuperSandro2000 do you agree this would be good to have in 24.05?

https://github.com/libproxy/libproxy/releases/tag/libproxy-0.5.0 https://github.com/libproxy/libproxy/releases/tag/0.5.1 https://github.com/libproxy/libproxy/releases/tag/0.5.2 https://github.com/libproxy/libproxy/releases/tag/0.5.3 Complete rewrite of the project, reduces runtime closure significantly. Co-authored-by: Jan Tojnar <jtojnar@gmail.com>

SuperSandro2000 · 2024-04-11T09:23:45Z

Now or never 👍🏼

vcunat · 2024-04-14T15:09:51Z

It now won't build on *-darwin, probably due to this update:
https://hydra.nixos.org/build/256131588
https://hydra.nixos.org/build/256069357
/cc the staging-next PR staging-next 2024-04-12 #303527

jtojnar · 2024-04-14T17:05:16Z

Hopefully resolved in 107ae55.

vcunat · 2024-04-15T04:39:21Z

Confirmed ❤️

vcunat · 2024-04-15T04:45:10Z

There's include dependency on glib, apparently: https://hydra.nixos.org/build/256292509/nixlog/1/tail

I wonder if it would be best (for the long term) to ensure that they're met, either by propagatedBuildInputs or additional flags in libproxy-1.0.pc.

vcunat · 2024-04-15T05:32:08Z

Wait... that derivation does have glib in build inputs (and it's even shown as detected in the log). I don't get how that include error happens; I don't expect it's really related to libproxy.

EDIT: pushed a workaround at least: c5910ff

jtojnar · 2024-04-15T10:30:19Z

Looks like this is another issue caused by us interpreting Requires.private differently. We should probably revert libproxy/libproxy#239

vcunat · 2024-04-15T12:16:47Z

Right, pushed as 3a48b90

SuperSandro2000 requested a review from jtojnar December 5, 2023 21:20

SuperSandro2000 mentioned this pull request Dec 5, 2023

libnm: init, libproxy: use libnm instead of full networkmanager #241762

Closed

12 tasks

SuperSandro2000 requested a review from wegank December 5, 2023 21:33

jtojnar reviewed Dec 6, 2023

View reviewed changes

SuperSandro2000 force-pushed the libproxy branch from ab73471 to 29225de Compare December 10, 2023 02:19

jtojnar reviewed Dec 10, 2023

View reviewed changes

pkgs/development/libraries/libproxy/default.nix Outdated Show resolved Hide resolved

jtojnar reviewed Dec 10, 2023

View reviewed changes

pkgs/development/libraries/libproxy/default.nix Outdated Show resolved Hide resolved

jtojnar reviewed Dec 10, 2023

View reviewed changes

pkgs/development/libraries/libproxy/default.nix Outdated Show resolved Hide resolved

SuperSandro2000 force-pushed the libproxy branch from 29225de to 526e9c6 Compare December 10, 2023 18:40

ofborg bot requested review from WilliButz, anthonyroussel and gbtb December 10, 2023 22:25

jtojnar mentioned this pull request Dec 25, 2023

gst_all_1.gst-plugins-good: dlopen libsoup_3 with an absolute path #276408

Merged

13 tasks

SuperSandro2000 force-pushed the libproxy branch 2 times, most recently from 63726c9 to 1b368a5 Compare January 14, 2024 18:16

ofborg bot added 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. and removed 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Jan 14, 2024

SuperSandro2000 force-pushed the libproxy branch from 1b368a5 to d003872 Compare January 24, 2024 13:35

SuperSandro2000 changed the base branch from master to staging January 24, 2024 13:35

jtojnar force-pushed the libproxy branch from fccfac5 to 2f6cc3a Compare January 27, 2024 15:20

jtojnar mentioned this pull request Jan 27, 2024

gnome backend does not fall back to http for https URIs libproxy/libproxy#270

Closed

wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 20, 2024

SuperSandro2000 force-pushed the libproxy branch from 2f6cc3a to 3e6ae42 Compare April 11, 2024 09:23

jtojnar added this to the 24.05 milestone Apr 11, 2024

ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 11, 2024

SuperSandro2000 merged commit 57e4ea0 into NixOS:staging Apr 11, 2024

SuperSandro2000 deleted the libproxy branch April 11, 2024 13:14

Uh oh!

Conversation

SuperSandro2000 commented Dec 5, 2023 • edited by amaxine Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of changes

Things done

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

SuperSandro2000 commented Jan 14, 2024

Uh oh!

jtojnar commented Jan 20, 2024

Uh oh!

SuperSandro2000 commented Jan 24, 2024

Uh oh!

jtojnar commented Jan 24, 2024

Uh oh!

jtojnar commented Jan 27, 2024

Uh oh!

jtojnar commented Jan 27, 2024

Uh oh!

jtojnar commented Apr 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SuperSandro2000 commented Apr 11, 2024

Uh oh!

vcunat commented Apr 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jtojnar commented Apr 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vcunat commented Apr 15, 2024

Uh oh!

vcunat commented Apr 15, 2024

Uh oh!

vcunat commented Apr 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jtojnar commented Apr 15, 2024

Uh oh!

vcunat commented Apr 15, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

SuperSandro2000 commented Dec 5, 2023 •

edited by amaxine

Loading

jtojnar commented Apr 11, 2024 •

edited

Loading

vcunat commented Apr 14, 2024 •

edited

Loading

jtojnar commented Apr 14, 2024 •

edited

Loading

vcunat commented Apr 15, 2024 •

edited

Loading