commit 4c2f564ef005e0d260aca6fb17f31c6216fcfb7a · pyrox.dev/nixpkgs

nixos/doc/manual/release-notes/rl-2505.section.md

···

       578
       578
        
       

     

       579
       579
        
       - GOverlay has been updated to 1.2, please check the [upstream changelog](https://github.com/benjamimgois/goverlay/releases) for more details.

     

       580
       580
        
       

     

       581
       581
       +
       - [`services.geoclue2`](#opt-services.geoclue2.enable) now has an `enableStatic` option, which allows the NixOS configuration to specify a fixed location for GeoClue to use.

     

       582
       582
       +
       

     

       581
       583
        
       - [`services.mongodb`](#opt-services.mongodb.enable) is now compatible with the `mongodb-ce` binary package. To make use of it, set [`services.mongodb.package`](#opt-services.mongodb.package) to `pkgs.mongodb-ce`.

     

       582
       584
        
       

     

       583
       585
        
       - [`services.jupyter`](#opt-services.jupyter.enable) is now compatible with `Jupyter Notebook 7`. See [the migration guide](https://jupyter-notebook.readthedocs.io/en/latest/migrate_to_notebook7.html) for details.

+75 -6

nixos/modules/services/desktops/geoclue2.nix

···

       136
       136
        
               '';

     

       137
       137
        
             };

     

       138
       138
        
       

     

       139
       139
       +
             enableStatic = lib.mkOption {

     

       140
       140
       +
               type = lib.types.bool;

     

       141
       141
       +
               default = false;

     

       142
       142
       +
               description = ''

     

       143
       143
       +
                 Whether to enable the static source. This source defines a fixed

     

       144
       144
       +
                 location using the `staticLatitude`, `staticLongitude`,

     

       145
       145
       +
                 `staticAltitude`, and `staticAccuracy` options.

     

       146
       146
       +
       

     

       147
       147
       +
                 Setting `enableStatic` to true will disable all other sources, to

     

       148
       148
       +
                 prevent conflicts. Use `lib.mkForce true` when enabling other sources

     

       149
       149
       +
                 if for some reason you want to override this.

     

       150
       150
       +
               '';

     

       151
       151
       +
             };

     

       152
       152
       +
       

     

       153
       153
       +
             staticLatitude = lib.mkOption {

     

       154
       154
       +
               type = lib.types.numbers.between (-90) 90;

     

       155
       155
       +
               description = ''

     

       156
       156
       +
                 Latitude to use for the static source. Defaults to `location.latitude`.

     

       157
       157
       +
               '';

     

       158
       158
       +
             };

     

       159
       159
       +
       

     

       160
       160
       +
             staticLongitude = lib.mkOption {

     

       161
       161
       +
               type = lib.types.numbers.between (-180) 180;

     

       162
       162
       +
               description = ''

     

       163
       163
       +
                 Longitude to use for the static source. Defaults to `location.longitude`.

     

       164
       164
       +
               '';

     

       165
       165
       +
             };

     

       166
       166
       +
       

     

       167
       167
       +
             staticAltitude = lib.mkOption {

     

       168
       168
       +
               type = lib.types.number;

     

       169
       169
       +
               description = ''

     

       170
       170
       +
                 Altitude in meters to use for the static source.

     

       171
       171
       +
               '';

     

       172
       172
       +
             };

     

       173
       173
       +
       

     

       174
       174
       +
             staticAccuracy = lib.mkOption {

     

       175
       175
       +
               type = lib.types.numbers.positive;

     

       176
       176
       +
               description = ''

     

       177
       177
       +
                 Accuracy radius in meters to use for the static source.

     

       178
       178
       +
               '';

     

       179
       179
       +
             };

     

       180
       180
       +
       

     

       139
       181
        
             geoProviderUrl = lib.mkOption {

     

       140
       182
        
               type = lib.types.str;

     

       141
       183
        
               default = "https://location.services.mozilla.com/v1/geolocate?key=geoclue";

     
···

       224
       266
        
             groups.geoclue = { };

     

       225
       267
        
           };

     

       226
       268
        
       

     

       269
       269
       +
           services.geoclue2 = {

     

       270
       270
       +
             enable3G = lib.mkIf cfg.enableStatic false;

     

       271
       271
       +
             enableCDMA = lib.mkIf cfg.enableStatic false;

     

       272
       272
       +
             enableModemGPS = lib.mkIf cfg.enableStatic false;

     

       273
       273
       +
             enableNmea = lib.mkIf cfg.enableStatic false;

     

       274
       274
       +
             enableWifi = lib.mkIf cfg.enableStatic false;

     

       275
       275
       +
             staticLatitude = lib.mkDefault config.location.latitude;

     

       276
       276
       +
             staticLongitude = lib.mkDefault config.location.longitude;

     

       277
       277
       +
           };

     

       278
       278
       +
       

     

       227
       279
        
           systemd.services.geoclue = {

     

       228
       280
        
             wants = lib.optionals cfg.enableWifi [ "network-online.target" ];

     

       229
       281
        
             after = lib.optionals cfg.enableWifi [ "network-online.target" ];

     
···

       284
       336
        
               modem-gps = {

     

       285
       337
        
                 enable = cfg.enableModemGPS;

     

       286
       338
        
               };

     

       287
       287
       -
               wifi = {

     

       288
       288
       -
                 enable = cfg.enableWifi;

     

       289
       289
       -
                 url = cfg.geoProviderUrl;

     

       290
       290
       -
                 submit-data = lib.boolToString cfg.submitData;

     

       291
       291
       -
                 submission-url = cfg.submissionUrl;

     

       292
       292
       -
                 submission-nick = cfg.submissionNick;

     

       339
       339
       +
               wifi =

     

       340
       340
       +
                 {

     

       341
       341
       +
                   enable = cfg.enableWifi;

     

       342
       342
       +
                 }

     

       343
       343
       +
                 // lib.optionalAttrs cfg.enableWifi {

     

       344
       344
       +
                   url = cfg.geoProviderUrl;

     

       345
       345
       +
                   submit-data = lib.boolToString cfg.submitData;

     

       346
       346
       +
                   submission-url = cfg.submissionUrl;

     

       347
       347
       +
                   submission-nick = cfg.submissionNick;

     

       348
       348
       +
                 };

     

       349
       349
       +
               static-source = {

     

       350
       350
       +
                 enable = cfg.enableStatic;

     

       293
       351
        
               };

     

       294
       352
        
             }

     

       295
       353
        
             // lib.mapAttrs' appConfigToINICompatible cfg.appConfig

     

       296
       354
        
           );

     

       355
       355
       +
       

     

       356
       356
       +
           environment.etc.geolocation = lib.mkIf cfg.enableStatic {

     

       357
       357
       +
             mode = "0440";

     

       358
       358
       +
             group = "geoclue";

     

       359
       359
       +
             text = ''

     

       360
       360
       +
               ${toString cfg.staticLatitude}

     

       361
       361
       +
               ${toString cfg.staticLongitude}

     

       362
       362
       +
               ${toString cfg.staticAltitude}

     

       363
       363
       +
               ${toString cfg.staticAccuracy}

     

       364
       364
       +
             '';

     

       365
       365
       +
           };

     

       297
       366
        
         };

     

       298
       367
        
       

     

       299
       368
        
         meta = with lib; {

nixos/tests/all-tests.nix

···

       455
       455
        
         garage = handleTest ./garage {};

     

       456
       456
        
         gatus = runTest ./gatus.nix;

     

       457
       457
        
         gemstash = handleTest ./gemstash.nix {};

     

       458
       458
       +
         geoclue2 = runTest ./geoclue2.nix;

     

       458
       459
        
         geoserver = runTest ./geoserver.nix;

     

       459
       460
        
         gerrit = handleTest ./gerrit.nix {};

     

       460
       461
        
         geth = handleTest ./geth.nix {};

+36

nixos/tests/geoclue2.nix

···

       1
       1
       +
       { config, lib, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "geoclue2";

     

       4
       4
       +
         meta = {

     

       5
       5
       +
           maintainers = with lib.maintainers; [ rhendric ];

     

       6
       6
       +
         };

     

       7
       7
       +
       

     

       8
       8
       +
         nodes.machine = {

     

       9
       9
       +
           imports = [ common/user-account.nix ];

     

       10
       10
       +
       

     

       11
       11
       +
           location = {

     

       12
       12
       +
             latitude = 12.345;

     

       13
       13
       +
             longitude = -67.890;

     

       14
       14
       +
           };

     

       15
       15
       +
       

     

       16
       16
       +
           services.geoclue2 = {

     

       17
       17
       +
             enable = true;

     

       18
       18
       +
             enableDemoAgent = true;

     

       19
       19
       +
             enableStatic = true;

     

       20
       20
       +
             staticAltitude = 123.45;

     

       21
       21
       +
             staticAccuracy = 1000;

     

       22
       22
       +
           };

     

       23
       23
       +
         };

     

       24
       24
       +
       

     

       25
       25
       +
         testScript =

     

       26
       26
       +
           let

     

       27
       27
       +
             inherit (config.node) pkgs;

     

       28
       28
       +
           in

     

       29
       29
       +
           ''

     

       30
       30
       +
             whereAmI = machine.succeed('machinectl shell alice@.host ${pkgs.geoclue2}/libexec/geoclue-2.0/demos/where-am-i -t 5')

     

       31
       31
       +
             assert ("Latitude:    12.345000°" in whereAmI), f"Incorrect latitude in:\n{whereAmI}"

     

       32
       32
       +
             assert ("Longitude:   -67.890000°" in whereAmI), f"Incorrect longitude in:\n{whereAmI}"

     

       33
       33
       +
             assert ("Altitude:    123.450000 meters" in whereAmI), f"Incorrect altitude in:\n{whereAmI}"

     

       34
       34
       +
             assert ("Accuracy:    1000.000000 meters" in whereAmI), f"Incorrect accuracy in:\n{whereAmI}"

     

       35
       35
       +
           '';

     

       36
       36
       +
       }

-17

pkgs/by-name/ge/geoclue2/add-option-for-installation-sysconfdir.patch

···

       2
       2
        
       index b22ff55..01c5910 100644

     

       3
       3
        
       --- a/data/meson.build

     

       4
       4
        
       +++ b/data/meson.build

     

       5
       5
       -
       @@ -1,6 +1,6 @@

     

       6
       6
       -
        if get_option('enable-backend')

     

       7
       7
       -
            conf = configuration_data()

     

       8
       8
       -
       -    conf.set('sysconfdir', sysconfdir)

     

       9
       9
       -
       +    conf.set('sysconfdir', sysconfdir_install)

     

       10
       10
       -
        

     

       11
       11
       -
            if get_option('demo-agent')

     

       12
       12
       -
                conf.set('demo_agent', 'geoclue-demo-agent;')

     

       13
       5
        
       @@ -14,7 +14,7 @@ if get_option('enable-backend')

     

       14
       6
        
                conf.set('default_wifi_enable', 'false')

     

       15
       7
        
            endif

     
···

       19
       11
        
            configure_file(output: 'geoclue.conf',

     

       20
       12
        
                           input: 'geoclue.conf.in',

     

       21
       13
        
                           configuration: conf,

     

       22
       22
       -
       @@ -23,7 +23,7 @@ if get_option('enable-backend')

     

       23
       23
       -
            conf = configuration_data()

     

       24
       24
       -
            conf.set('libexecdir', libexecdir)

     

       25
       25
       -
            conf.set('dbus_srv_user', get_option('dbus-srv-user'))

     

       26
       26
       -
       -    conf.set('sysconfdir', sysconfdir)

     

       27
       27
       -
       +    conf.set('sysconfdir', sysconfdir_install)

     

       28
       28
       -
        

     

       29
       29
       -
            confd_dir = join_paths(conf_dir, 'conf.d')

     

       30
       30
       -
            install_emptydir(confd_dir)

     

       31
       14
        
       diff --git a/demo/meson.build b/demo/meson.build

     

       32
       15
        
       index 1427fbe..2623f16 100644

     

       33
       16
        
       --- a/demo/meson.build

+7 -1

pkgs/by-name/ge/geoclue2/package.nix

···

       24
       24
        
         vala,

     

       25
       25
        
         withDemoAgent ? false,

     

       26
       26
        
         nix-update-script,

     

       27
       27
       +
         nixosTests,

     

       27
       28
        
       }:

     

       28
       29
        
       

     

       29
       30
        
       stdenv.mkDerivation (finalAttrs: {

     
···

       107
       108
        
           patchShebangs demo/install-file.py

     

       108
       109
        
         '';

     

       109
       110
        
       

     

       110
       110
       -
         passthru.updateScript = nix-update-script { };

     

       111
       111
       +
         passthru = {

     

       112
       112
       +
           tests = {

     

       113
       113
       +
             inherit (nixosTests) geoclue2;

     

       114
       114
       +
           };

     

       115
       115
       +
           updateScript = nix-update-script { };

     

       116
       116
       +
         };

     

       111
       117
        
       

     

       112
       118
        
         meta = with lib; {

     

       113
       119
        
           broken = stdenv.hostPlatform.isDarwin && withDemoAgent;