commit 57e4ea002b01a860f47dc6f34f11f90c2a05f643 · pyrox.dev/nixpkgs

+88 -49

pkgs/development/libraries/libproxy/default.nix

···

       1
       1
        
       { lib

     

       2
       2
       -
       , stdenv

     

       2
       2
       +
       , _experimental-update-script-combinators

     

       3
       3
       +
       , curl

     

       4
       4
       +
       , darwin

     

       5
       5
       +
       , duktape

     

       3
       6
        
       , fetchFromGitHub

     

       4
       7
        
       , fetchpatch

     

       8
       8
       +
       , gi-docgen

     

       9
       9
       +
       , gitUpdater

     

       10
       10
       +
       , glib

     

       11
       11
       +
       , gobject-introspection

     

       12
       12
       +
       , gsettings-desktop-schemas

     

       13
       13
       +
       , makeHardcodeGsettingsPatch

     

       14
       14
       +
       , meson

     

       15
       15
       +
       , ninja

     

       5
       16
        
       , pkg-config

     

       6
       6
       -
       , cmake

     

       7
       7
       -
       , zlib

     

       8
       8
       -
       , dbus

     

       9
       9
       -
       , networkmanager

     

       10
       10
       -
       , enableJavaScript ? stdenv.isDarwin || lib.meta.availableOn stdenv.hostPlatform duktape

     

       11
       11
       -
       , duktape

     

       12
       12
       -
       , pcre

     

       13
       13
       -
       , gsettings-desktop-schemas

     

       14
       14
       -
       , glib

     

       15
       15
       -
       , makeWrapper

     

       16
       16
       -
       , python3

     

       17
       17
       -
       , SystemConfiguration

     

       18
       18
       -
       , CoreFoundation

     

       19
       19
       -
       , JavaScriptCore

     

       17
       17
       +
       , stdenv

     

       18
       18
       +
       , substituteAll

     

       19
       19
       +
       , vala

     

       20
       20
        
       }:

     

       21
       21
        
       

     

       22
       22
       -
       stdenv.mkDerivation rec {

     

       22
       22
       +
       stdenv.mkDerivation (finalAttrs: {

     

       23
       23
        
         pname = "libproxy";

     

       24
       24
       -
         version = "0.4.18";

     

       24
       24
       +
         version = "0.5.3";

     

       25
       25
       +
       

     

       26
       26
       +
         outputs = [ "out" "dev" "devdoc" ];

     

       25
       27
        
       

     

       26
       28
        
         src = fetchFromGitHub {

     

       27
       29
        
           owner = "libproxy";

     

       28
       30
        
           repo = "libproxy";

     

       29
       29
       -
           rev = version;

     

       30
       30
       -
           hash = "sha256-pqj1LwRdOK2CUu3hYIsogQIXxWzShDuKEbDTbtWkgnQ=";

     

       31
       31
       +
           rev = finalAttrs.version;

     

       32
       32
       +
           hash = "sha256-qdYB6HJkgboS8kkTvTqLy6Z3JYY5SOJsRl6nZM0iuvw=";

     

       31
       33
        
         };

     

       32
       34
        
       

     

       33
       33
       -
         patches = lib.optionals stdenv.isDarwin [

     

       34
       34
       -
           # https://github.com/libproxy/libproxy/pull/189

     

       35
       35
       +
         patches = [

     

       36
       36
       +
           # Minor refactoring. Allows the following patches to apply without rebasing.

     

       35
       37
        
           (fetchpatch {

     

       36
       36
       -
             url = "https://github.com/libproxy/libproxy/commit/4331b9db427ce2c25ff5eeb597bec4bc35ed1a0b.patch";

     

       37
       37
       -
             sha256 = "sha256-uTh3rYVvEke1iWVHsT3Zj2H1F+gyLrffcmyt0JEKaCA=";

     

       38
       38
       +
             url = "https://github.com/libproxy/libproxy/commit/397f4dc72607cc1bb3b584ffd3de49f8ba80491a.patch";

     

       39
       39
       +
             hash = "sha256-iUMBMpcVOLG+NxEj8Nd7JtKZFmoGXn0t6A2r2ayiteg=";

     

       40
       40
       +
             includes = [

     

       41
       41
       +
               "src/backend/plugins/config-gnome/config-gnome.c"

     

       42
       42
       +
             ];

     

       38
       43
        
           })

     

       39
       39
       -
         ];

     

       40
       44
        
       

     

       41
       41
       -
         outputs = [ "out" "dev" "py3" ];

     

       45
       45
       +
           # Disable schema presence detection, it would fail because it cannot be autopatched,

     

       46
       46
       +
           # and it will be hardcoded by the next patch anyway.

     

       47
       47
       +
           ./skip-gsettings-detection.patch

     

       48
       48
       +
       

     

       49
       49
       +
           # Hardcode path to Settings schemas for GNOME & related desktops.

     

       50
       50
       +
           # Otherwise every app using libproxy would need to be wrapped individually.

     

       51
       51
       +
           (substituteAll {

     

       52
       52
       +
             src = ./hardcode-gsettings.patch;

     

       53
       53
       +
             gds = glib.getSchemaPath gsettings-desktop-schemas;

     

       54
       54
       +
           })

     

       55
       55
       +
         ];

     

       42
       56
        
       

     

       43
       57
        
         nativeBuildInputs = [

     

       58
       58
       +
           gi-docgen

     

       59
       59
       +
           gobject-introspection

     

       60
       60
       +
           meson

     

       61
       61
       +
           ninja

     

       44
       62
        
           pkg-config

     

       45
       45
       -
           cmake

     

       46
       46
       -
           makeWrapper

     

       63
       63
       +
           vala

     

       47
       64
        
         ];

     

       48
       65
        
       

     

       49
       66
        
         buildInputs = [

     

       50
       50
       -
           pcre

     

       51
       51
       -
           python3

     

       52
       52
       -
           zlib

     

       53
       53
       -
         ] ++ lib.optionals enableJavaScript [

     

       54
       54
       -
           (if stdenv.hostPlatform.isDarwin then JavaScriptCore else duktape)

     

       55
       55
       -
         ] ++ (if stdenv.hostPlatform.isDarwin then [

     

       67
       67
       +
           curl

     

       68
       68
       +
           duktape

     

       69
       69
       +
         ] ++ (if stdenv.hostPlatform.isDarwin then (with darwin.apple_sdk.frameworks; [

     

       70
       70
       +
           CoreFoundation

     

       56
       71
        
           SystemConfiguration

     

       57
       57
       -
           CoreFoundation

     

       58
       58
       -
         ] else [

     

       72
       72
       +
         ]) else [

     

       59
       73
        
           glib

     

       60
       60
       -
           dbus

     

       61
       61
       -
           networkmanager

     

       74
       74
       +
           gsettings-desktop-schemas

     

       62
       75
        
         ]);

     

       63
       76
        
       

     

       64
       64
       -
         cmakeFlags = [

     

       65
       65
       -
           "-DWITH_PYTHON2=OFF"

     

       66
       66
       -
           "-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}"

     

       67
       67
       -
         ] ++ lib.optional (enableJavaScript && !stdenv.hostPlatform.isDarwin) "-DWITH_MOZJS=ON";

     

       77
       77
       +
         doCheck = true;

     

       68
       78
        
       

     

       69
       69
       -
         postFixup = lib.optionalString stdenv.isLinux ''

     

       70
       70
       -
           # config_gnome3 uses the helper to find GNOME proxy settings

     

       71
       71
       -
           wrapProgram $out/libexec/pxgsettings --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"

     

       79
       79
       +
         postPatch = ''

     

       80
       80
       +
           # Fix running script that will try to install git hooks.

     

       81
       81
       +
           # Though it will not do anything since we do not keep .git/ directory.

     

       82
       82
       +
           # https://github.com/libproxy/libproxy/issues/262

     

       83
       83
       +
           chmod +x data/install-git-hook.sh

     

       84
       84
       +
           patchShebangs data/install-git-hook.sh

     

       72
       85
        
         '';

     

       73
       86
        
       

     

       74
       74
       -
         doCheck = false; # fails 1 out of 10 tests

     

       87
       87
       +
         postFixup = ''

     

       88
       88
       +
           # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.

     

       89
       89
       +
           moveToOutput "share/doc" "$devdoc"

     

       90
       90
       +
         '';

     

       91
       91
       +
       

     

       92
       92
       +
         passthru = {

     

       93
       93
       +
           hardcodeGsettingsPatch = makeHardcodeGsettingsPatch {

     

       94
       94
       +
             schemaIdToVariableMapping = {

     

       95
       95
       +
               "org.gnome.system.proxy" = "gds";

     

       96
       96
       +
               "org.gnome.system.proxy.http" = "gds";

     

       97
       97
       +
               "org.gnome.system.proxy.https" = "gds";

     

       98
       98
       +
               "org.gnome.system.proxy.ftp" = "gds";

     

       99
       99
       +
               "org.gnome.system.proxy.socks" = "gds";

     

       100
       100
       +
             };

     

       101
       101
       +
             inherit (finalAttrs) src;

     

       102
       102
       +
           };

     

       103
       103
       +
       

     

       104
       104
       +
           updateScript =

     

       105
       105
       +
             let

     

       106
       106
       +
               updateSource = gitUpdater { };

     

       107
       107
       +
               updatePatch = _experimental-update-script-combinators.copyAttrOutputToFile "libproxy.hardcodeGsettingsPatch" ./hardcode-gsettings.patch;

     

       108
       108
       +
             in

     

       109
       109
       +
             _experimental-update-script-combinators.sequence [

     

       110
       110
       +
               updateSource

     

       111
       111
       +
               updatePatch

     

       112
       112
       +
             ];

     

       113
       113
       +
         };

     

       75
       114
        
       

     

       76
       115
        
         meta = with lib; {

     

       77
       77
       -
           platforms = platforms.linux ++ platforms.darwin;

     

       78
       78
       -
           license = licenses.lgpl21;

     

       79
       79
       -
           homepage = "https://libproxy.github.io/libproxy/";

     

       80
       116
        
           description = "A library that provides automatic proxy configuration management";

     

       117
       117
       +
           homepage = "https://libproxy.github.io/libproxy/";

     

       118
       118
       +
           license = licenses.lgpl21Plus;

     

       119
       119
       +
           platforms = platforms.linux ++ platforms.darwin;

     

       81
       120
        
           mainProgram = "proxy";

     

       82
       121
        
         };

     

       83
       83
       -
       }

     

       122
       122
       +
       })

+140

pkgs/development/libraries/libproxy/hardcode-gsettings.patch

···

       1
       1
       +
       diff --git a/src/backend/plugins/config-gnome/config-gnome.c b/src/backend/plugins/config-gnome/config-gnome.c

     

       2
       2
       +
       index 820827b..338e269 100644

     

       3
       3
       +
       --- a/src/backend/plugins/config-gnome/config-gnome.c

     

       4
       4
       +
       +++ b/src/backend/plugins/config-gnome/config-gnome.c

     

       5
       5
       +
       @@ -85,11 +85,60 @@ px_config_gnome_init (PxConfigGnome *self)

     

       6
       6
       +
          if (!self->available)

     

       7
       7
       +
            return;

     

       8
       8
       +
        

     

       9
       9
       +
       -  self->proxy_settings = g_settings_new ("org.gnome.system.proxy");

     

       10
       10
       +
       -  self->http_proxy_settings = g_settings_new ("org.gnome.system.proxy.http");

     

       11
       11
       +
       -  self->https_proxy_settings = g_settings_new ("org.gnome.system.proxy.https");

     

       12
       12
       +
       -  self->ftp_proxy_settings = g_settings_new ("org.gnome.system.proxy.ftp");

     

       13
       13
       +
       -  self->socks_proxy_settings = g_settings_new ("org.gnome.system.proxy.socks");

     

       14
       14
       +
       +  {

     

       15
       15
       +
       +    g_autoptr(GSettingsSchemaSource) schema_source;

     

       16
       16
       +
       +    g_autoptr(GSettingsSchema) schema;

     

       17
       17
       +
       +    schema_source = g_settings_schema_source_new_from_directory("@gds@",

     

       18
       18
       +
       +                                                                g_settings_schema_source_get_default(),

     

       19
       19
       +
       +                                                                TRUE, NULL);

     

       20
       20
       +
       +    schema = g_settings_schema_source_lookup(schema_source,

     

       21
       21
       +
       +                                             "org.gnome.system.proxy", FALSE);

     

       22
       22
       +
       +    self->proxy_settings = g_settings_new_full(schema, NULL, NULL);

     

       23
       23
       +
       +  }

     

       24
       24
       +
       +  {

     

       25
       25
       +
       +    g_autoptr(GSettingsSchemaSource) schema_source;

     

       26
       26
       +
       +    g_autoptr(GSettingsSchema) schema;

     

       27
       27
       +
       +    schema_source = g_settings_schema_source_new_from_directory("@gds@",

     

       28
       28
       +
       +                                                                g_settings_schema_source_get_default(),

     

       29
       29
       +
       +                                                                TRUE, NULL);

     

       30
       30
       +
       +    schema = g_settings_schema_source_lookup(schema_source,

     

       31
       31
       +
       +                                             "org.gnome.system.proxy.http",

     

       32
       32
       +
       +                                             FALSE);

     

       33
       33
       +
       +    self->http_proxy_settings = g_settings_new_full(schema, NULL, NULL);

     

       34
       34
       +
       +  }

     

       35
       35
       +
       +  {

     

       36
       36
       +
       +    g_autoptr(GSettingsSchemaSource) schema_source;

     

       37
       37
       +
       +    g_autoptr(GSettingsSchema) schema;

     

       38
       38
       +
       +    schema_source = g_settings_schema_source_new_from_directory("@gds@",

     

       39
       39
       +
       +                                                                g_settings_schema_source_get_default(),

     

       40
       40
       +
       +                                                                TRUE, NULL);

     

       41
       41
       +
       +    schema = g_settings_schema_source_lookup(schema_source,

     

       42
       42
       +
       +                                             "org.gnome.system.proxy.https",

     

       43
       43
       +
       +                                             FALSE);

     

       44
       44
       +
       +    self->https_proxy_settings = g_settings_new_full(schema, NULL, NULL);

     

       45
       45
       +
       +  }

     

       46
       46
       +
       +  {

     

       47
       47
       +
       +    g_autoptr(GSettingsSchemaSource) schema_source;

     

       48
       48
       +
       +    g_autoptr(GSettingsSchema) schema;

     

       49
       49
       +
       +    schema_source = g_settings_schema_source_new_from_directory("@gds@",

     

       50
       50
       +
       +                                                                g_settings_schema_source_get_default(),

     

       51
       51
       +
       +                                                                TRUE, NULL);

     

       52
       52
       +
       +    schema = g_settings_schema_source_lookup(schema_source,

     

       53
       53
       +
       +                                             "org.gnome.system.proxy.ftp",

     

       54
       54
       +
       +                                             FALSE);

     

       55
       55
       +
       +    self->ftp_proxy_settings = g_settings_new_full(schema, NULL, NULL);

     

       56
       56
       +
       +  }

     

       57
       57
       +
       +  {

     

       58
       58
       +
       +    g_autoptr(GSettingsSchemaSource) schema_source;

     

       59
       59
       +
       +    g_autoptr(GSettingsSchema) schema;

     

       60
       60
       +
       +    schema_source = g_settings_schema_source_new_from_directory("@gds@",

     

       61
       61
       +
       +                                                                g_settings_schema_source_get_default(),

     

       62
       62
       +
       +                                                                TRUE, NULL);

     

       63
       63
       +
       +    schema = g_settings_schema_source_lookup(schema_source,

     

       64
       64
       +
       +                                             "org.gnome.system.proxy.socks",

     

       65
       65
       +
       +                                             FALSE);

     

       66
       66
       +
       +    self->socks_proxy_settings = g_settings_new_full(schema, NULL, NULL);

     

       67
       67
       +
       +  }

     

       68
       68
       +
        }

     

       69
       69
       +
        

     

       70
       70
       +
        static void

     

       71
       71
       +
       diff --git a/tests/config-gnome-test.c b/tests/config-gnome-test.c

     

       72
       72
       +
       index f80914a..118d429 100644

     

       73
       73
       +
       --- a/tests/config-gnome-test.c

     

       74
       74
       +
       +++ b/tests/config-gnome-test.c

     

       75
       75
       +
       @@ -60,11 +60,60 @@ static void

     

       76
       76
       +
        fixture_setup (Fixture       *self,

     

       77
       77
       +
                       gconstpointer  data)

     

       78
       78
       +
        {

     

       79
       79
       +
       -  self->proxy_settings = g_settings_new ("org.gnome.system.proxy");

     

       80
       80
       +
       -  self->http_proxy_settings = g_settings_new ("org.gnome.system.proxy.http");

     

       81
       81
       +
       -  self->https_proxy_settings = g_settings_new ("org.gnome.system.proxy.https");

     

       82
       82
       +
       -  self->ftp_proxy_settings = g_settings_new ("org.gnome.system.proxy.ftp");

     

       83
       83
       +
       -  self->socks_proxy_settings = g_settings_new ("org.gnome.system.proxy.socks");

     

       84
       84
       +
       +  {

     

       85
       85
       +
       +    g_autoptr(GSettingsSchemaSource) schema_source;

     

       86
       86
       +
       +    g_autoptr(GSettingsSchema) schema;

     

       87
       87
       +
       +    schema_source = g_settings_schema_source_new_from_directory("@gds@",

     

       88
       88
       +
       +                                                                g_settings_schema_source_get_default(),

     

       89
       89
       +
       +                                                                TRUE, NULL);

     

       90
       90
       +
       +    schema = g_settings_schema_source_lookup(schema_source,

     

       91
       91
       +
       +                                             "org.gnome.system.proxy", FALSE);

     

       92
       92
       +
       +    self->proxy_settings = g_settings_new_full(schema, NULL, NULL);

     

       93
       93
       +
       +  }

     

       94
       94
       +
       +  {

     

       95
       95
       +
       +    g_autoptr(GSettingsSchemaSource) schema_source;

     

       96
       96
       +
       +    g_autoptr(GSettingsSchema) schema;

     

       97
       97
       +
       +    schema_source = g_settings_schema_source_new_from_directory("@gds@",

     

       98
       98
       +
       +                                                                g_settings_schema_source_get_default(),

     

       99
       99
       +
       +                                                                TRUE, NULL);

     

       100
       100
       +
       +    schema = g_settings_schema_source_lookup(schema_source,

     

       101
       101
       +
       +                                             "org.gnome.system.proxy.http",

     

       102
       102
       +
       +                                             FALSE);

     

       103
       103
       +
       +    self->http_proxy_settings = g_settings_new_full(schema, NULL, NULL);

     

       104
       104
       +
       +  }

     

       105
       105
       +
       +  {

     

       106
       106
       +
       +    g_autoptr(GSettingsSchemaSource) schema_source;

     

       107
       107
       +
       +    g_autoptr(GSettingsSchema) schema;

     

       108
       108
       +
       +    schema_source = g_settings_schema_source_new_from_directory("@gds@",

     

       109
       109
       +
       +                                                                g_settings_schema_source_get_default(),

     

       110
       110
       +
       +                                                                TRUE, NULL);

     

       111
       111
       +
       +    schema = g_settings_schema_source_lookup(schema_source,

     

       112
       112
       +
       +                                             "org.gnome.system.proxy.https",

     

       113
       113
       +
       +                                             FALSE);

     

       114
       114
       +
       +    self->https_proxy_settings = g_settings_new_full(schema, NULL, NULL);

     

       115
       115
       +
       +  }

     

       116
       116
       +
       +  {

     

       117
       117
       +
       +    g_autoptr(GSettingsSchemaSource) schema_source;

     

       118
       118
       +
       +    g_autoptr(GSettingsSchema) schema;

     

       119
       119
       +
       +    schema_source = g_settings_schema_source_new_from_directory("@gds@",

     

       120
       120
       +
       +                                                                g_settings_schema_source_get_default(),

     

       121
       121
       +
       +                                                                TRUE, NULL);

     

       122
       122
       +
       +    schema = g_settings_schema_source_lookup(schema_source,

     

       123
       123
       +
       +                                             "org.gnome.system.proxy.ftp",

     

       124
       124
       +
       +                                             FALSE);

     

       125
       125
       +
       +    self->ftp_proxy_settings = g_settings_new_full(schema, NULL, NULL);

     

       126
       126
       +
       +  }

     

       127
       127
       +
       +  {

     

       128
       128
       +
       +    g_autoptr(GSettingsSchemaSource) schema_source;

     

       129
       129
       +
       +    g_autoptr(GSettingsSchema) schema;

     

       130
       130
       +
       +    schema_source = g_settings_schema_source_new_from_directory("@gds@",

     

       131
       131
       +
       +                                                                g_settings_schema_source_get_default(),

     

       132
       132
       +
       +                                                                TRUE, NULL);

     

       133
       133
       +
       +    schema = g_settings_schema_source_lookup(schema_source,

     

       134
       134
       +
       +                                             "org.gnome.system.proxy.socks",

     

       135
       135
       +
       +                                             FALSE);

     

       136
       136
       +
       +    self->socks_proxy_settings = g_settings_new_full(schema, NULL, NULL);

     

       137
       137
       +
       +  }

     

       138
       138
       +
        }

     

       139
       139
       +
        

     

       140
       140
       +
        static void

+29

pkgs/development/libraries/libproxy/skip-gsettings-detection.patch

···

       1
       1
       +
       diff --git a/src/backend/plugins/config-gnome/config-gnome.c b/src/backend/plugins/config-gnome/config-gnome.c

     

       2
       2
       +
       index 52e812e..a1edcab 100644

     

       3
       3
       +
       --- a/src/backend/plugins/config-gnome/config-gnome.c

     

       4
       4
       +
       +++ b/src/backend/plugins/config-gnome/config-gnome.c

     

       5
       5
       +
       @@ -57,7 +57,6 @@ enum {

     

       6
       6
       +
        static void

     

       7
       7
       +
        px_config_gnome_init (PxConfigGnome *self)

     

       8
       8
       +
        {

     

       9
       9
       +
       -  GSettingsSchemaSource *source;

     

       10
       10
       +
          g_autoptr (GSettingsSchema) proxy_schema = NULL;

     

       11
       11
       +
          const char *desktops;

     

       12
       12
       +
        

     

       13
       13
       +
       @@ -71,15 +70,7 @@ px_config_gnome_init (PxConfigGnome *self)

     

       14
       14
       +
          if (strstr (desktops, "GNOME") == NULL)

     

       15
       15
       +
            return;

     

       16
       16
       +
        

     

       17
       17
       +
       -  source = g_settings_schema_source_get_default ();

     

       18
       18
       +
       -  if (!source) {

     

       19
       19
       +
       -    g_warning ("GNOME desktop detected but no schemes installed, aborting.");

     

       20
       20
       +
       -    return;

     

       21
       21
       +
       -  }

     

       22
       22
       +
       -

     

       23
       23
       +
       -  proxy_schema = g_settings_schema_source_lookup (source, "org.gnome.system.proxy", TRUE);

     

       24
       24
       +
       -

     

       25
       25
       +
       -  self->available = proxy_schema != NULL;

     

       26
       26
       +
       +  self->available = TRUE;

     

       27
       27
       +
          if (!self->available)

     

       28
       28
       +
            return;

     

       29
       29
       +

+1 -3

pkgs/top-level/all-packages.nix

···

       22970
       22970
        
           stdenv = gccStdenv; # Required for darwin

     

       22971
       22971
        
         }) libprom libpromhttp;

     

       22972
       22972
        
       

     

       22973
       22973
       -
         libproxy = callPackage ../development/libraries/libproxy {

     

       22974
       22974
       -
           inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation JavaScriptCore;

     

       22975
       22975
       -
         };

     

       22973
       22973
       +
         libproxy = callPackage ../development/libraries/libproxy { };

     

       22976
       22974
        
       

     

       22977
       22975
        
         libpseudo = callPackage ../development/libraries/libpseudo { };

     

       22978
       22976