commit 5b50965f0495e7cc7d3f08fb88480a0329db939f · pyrox.dev/nixpkgs

+7

maintainers/maintainer-list.nix

···

       16592
       16592
        
           githubId = 2770647;

     

       16593
       16593
        
           name = "Simon Vandel Sillesen";

     

       16594
       16594
        
         };

     

       16595
       16595
       +
         sinanmohd = {

     

       16596
       16596
       +
           name = "Sinan Mohd";

     

       16597
       16597
       +
           email = "sinan@firemail.cc";

     

       16598
       16598
       +
           matrix = "@sinan:sinanmohd.com";

     

       16599
       16599
       +
           github = "sinanmohd";

     

       16600
       16600
       +
           githubId = 69694713;

     

       16601
       16601
       +
         };

     

       16595
       16602
        
         sioodmy = {

     

       16596
       16603
        
           name = "Antoni Sokołowski";

     

       16597
       16604
        
           github = "sioodmy";

+6

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

···

       65
       65
        
       

     

       66
       66
        
       - [hddfancontrol](https://github.com/desbma/hddfancontrol), a service to regulate fan speeds based on hard drive temperature. Available as [services.hddfancontrol](#opt-services.hddfancontrol.enable).

     

       67
       67
        
       

     

       68
       68
       +
       - [seatd](https://sr.ht/~kennylevinsen/seatd/), A minimal seat management daemon. Available as [services.seatd](#opt-services.seatd.enable).

     

       69
       69
       +
       

     

       68
       70
        
       - [GoToSocial](https://gotosocial.org/), an ActivityPub social network server, written in Golang. Available as [services.gotosocial](#opt-services.gotosocial.enable).

     

       69
       71
        
       

     

       70
       72
        
       - [Castopod](https://castopod.org/), an open-source hosting platform made for podcasters who want to engage and interact with their audience. Available as [services.castopod](#opt-services.castopod.enable).

     
···

       442
       444
        
         [v1.15](https://elixir-lang.org/blog/2023/06/19/elixir-v1-15-0-released/).

     

       443
       445
        
       

     

       444
       446
        
       - A new option was added to the virtualisation module that enables specifying explicitly named network interfaces in QEMU VMs. The existing `virtualisation.vlans` is still supported for cases where the name of the network interface is irrelevant.

     

       447
       447
       +
       

     

       448
       448
       +
       - Apptainer/Singularity now defaults to using `"$out/var/lib"` for the `LOCALSTATEDIR` configuration option instead of the top-level `"/var/lib"`. This change impacts the `SESSIONDIR` (container-run-time mount point) configuration, which is set to `$LOCALSTATEDIR/<apptainer or singularity>/mnt/session`. This detaches the packages from the top-level directory, rendering the NixOS module optional.

     

       449
       449
       +
       

     

       450
       450
       +
         The default behavior of the NixOS module `programs.singularity` stays unchanged. We add a new option `programs.singularity.enableExternalSysConfDir` (default to `true`) to specify whether to set the top-level `"/var/lib"` as `LOCALSTATEDIR` or not.

     

       445
       451
        
       

     

       446
       452
        
       - DocBook option documentation is no longer supported, all module documentation now uses markdown.

     

       447
       453

+1

nixos/modules/module-list.nix

···

       474
       474
        
         ./services/desktops/pipewire/pipewire.nix

     

       475
       475
        
         ./services/desktops/pipewire/wireplumber.nix

     

       476
       476
        
         ./services/desktops/profile-sync-daemon.nix

     

       477
       477
       +
         ./services/desktops/seatd.nix

     

       477
       478
        
         ./services/desktops/system-config-printer.nix

     

       478
       479
        
         ./services/desktops/system76-scheduler.nix

     

       479
       480
        
         ./services/desktops/telepathy.nix

+16 -6

nixos/modules/programs/singularity.nix

···

       45
       45
        
               Use `lib.mkForce` to forcefully specify the overridden package.

     

       46
       46
        
             '';

     

       47
       47
        
           };

     

       48
       48
       +
           enableExternalLocalStateDir = mkOption {

     

       49
       49
       +
             type = types.bool;

     

       50
       50
       +
             default = true;

     

       51
       51
       +
             example = false;

     

       52
       52
       +
             description = mdDoc ''

     

       53
       53
       +
               Whether to use top-level directories as LOCALSTATEDIR

     

       54
       54
       +
               instead of the store path ones.

     

       55
       55
       +
               This affects the SESSIONDIR of Apptainer/Singularity.

     

       56
       56
       +
               If set to true, the SESSIONDIR will become

     

       57
       57
       +
               `/var/lib/''${projectName}/mnt/session`.

     

       58
       58
       +
             '';

     

       59
       59
       +
           };

     

       48
       60
        
           enableFakeroot = mkOption {

     

       49
       61
        
             type = types.bool;

     

       50
       62
        
             default = true;

     
···

       65
       77
        
       

     

       66
       78
        
         config = mkIf cfg.enable {

     

       67
       79
        
           programs.singularity.packageOverriden = (cfg.package.override (

     

       68
       68
       -
             optionalAttrs cfg.enableFakeroot {

     

       80
       80
       +
             optionalAttrs cfg.enableExternalLocalStateDir {

     

       81
       81
       +
               externalLocalStateDir = "/var/lib";

     

       82
       82
       +
             } // optionalAttrs cfg.enableFakeroot {

     

       69
       83
        
               newuidmapPath = "/run/wrappers/bin/newuidmap";

     

       70
       84
        
               newgidmapPath = "/run/wrappers/bin/newgidmap";

     

       71
       85
        
             } // optionalAttrs cfg.enableSuid {

     
···

       80
       94
        
             group = "root";

     

       81
       95
        
             source = "${cfg.packageOverriden}/libexec/${cfg.packageOverriden.projectName}/bin/starter-suid.orig";

     

       82
       96
        
           };

     

       83
       83
       -
           systemd.tmpfiles.rules = [

     

       97
       97
       +
           systemd.tmpfiles.rules = mkIf cfg.enableExternalLocalStateDir [

     

       84
       98
        
             "d /var/lib/${cfg.packageOverriden.projectName}/mnt/session 0770 root root -"

     

       85
       85
       -
             "d /var/lib/${cfg.packageOverriden.projectName}/mnt/final 0770 root root -"

     

       86
       86
       -
             "d /var/lib/${cfg.packageOverriden.projectName}/mnt/overlay 0770 root root -"

     

       87
       87
       -
             "d /var/lib/${cfg.packageOverriden.projectName}/mnt/container 0770 root root -"

     

       88
       88
       -
             "d /var/lib/${cfg.packageOverriden.projectName}/mnt/source 0770 root root -"

     

       89
       99
        
           ];

     

       90
       100
        
         };

     

       91
       101

+51

nixos/modules/services/desktops/seatd.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         cfg = config.services.seatd;

     

       5
       5
       +
         inherit (lib) mkEnableOption mkOption mdDoc types;

     

       6
       6
       +
       in

     

       7
       7
       +
       {

     

       8
       8
       +
         meta.maintainers = with lib.maintainers; [ sinanmohd ];

     

       9
       9
       +
       

     

       10
       10
       +
         options.services.seatd = {

     

       11
       11
       +
           enable = mkEnableOption (mdDoc "seatd");

     

       12
       12
       +
       

     

       13
       13
       +
           user = mkOption {

     

       14
       14
       +
             type = types.str;

     

       15
       15
       +
             default = "root";

     

       16
       16
       +
             description = mdDoc "User to own the seatd socket";

     

       17
       17
       +
           };

     

       18
       18
       +
           group = mkOption {

     

       19
       19
       +
             type = types.str;

     

       20
       20
       +
             default = "seat";

     

       21
       21
       +
             description = mdDoc "Group to own the seatd socket";

     

       22
       22
       +
           };

     

       23
       23
       +
           logLevel = mkOption {

     

       24
       24
       +
             type = types.enum [ "debug" "info" "error" "silent" ];

     

       25
       25
       +
             default = "info";

     

       26
       26
       +
             description = mdDoc "Logging verbosity";

     

       27
       27
       +
           };

     

       28
       28
       +
         };

     

       29
       29
       +
       

     

       30
       30
       +
         config = lib.mkIf cfg.enable {

     

       31
       31
       +
           environment.systemPackages = with pkgs; [ seatd sdnotify-wrapper ];

     

       32
       32
       +
           users.groups.seat = lib.mkIf (cfg.group == "seat") {};

     

       33
       33
       +
       

     

       34
       34
       +
           systemd.services.seatd = {

     

       35
       35
       +
             description = "Seat management daemon";

     

       36
       36
       +
             documentation = [ "man:seatd(1)" ];

     

       37
       37
       +
       

     

       38
       38
       +
             wantedBy = [ "multi-user.target" ];

     

       39
       39
       +
             restartIfChanged = false;

     

       40
       40
       +
       

     

       41
       41
       +
             serviceConfig = {

     

       42
       42
       +
               Type = "notify";

     

       43
       43
       +
               NotifyAccess = "all";

     

       44
       44
       +
               SyslogIdentifier = "seatd";

     

       45
       45
       +
               ExecStart = "${pkgs.sdnotify-wrapper}/bin/sdnotify-wrapper ${pkgs.seatd.bin}/bin/seatd -n 1 -u ${cfg.user} -g ${cfg.group} -l ${cfg.logLevel}";

     

       46
       46
       +
               RestartSec = 1;

     

       47
       47
       +
               Restart = "always";

     

       48
       48
       +
             };

     

       49
       49
       +
           };

     

       50
       50
       +
         };

     

       51
       51
       +
       }

+1

nixos/tests/all-tests.nix

···

       742
       742
        
         sddm = handleTest ./sddm.nix {};

     

       743
       743
        
         seafile = handleTest ./seafile.nix {};

     

       744
       744
        
         searx = handleTest ./searx.nix {};

     

       745
       745
       +
         seatd = handleTest ./seatd.nix {};

     

       745
       746
        
         service-runner = handleTest ./service-runner.nix {};

     

       746
       747
        
         sftpgo = runTest ./sftpgo.nix;

     

       747
       748
        
         sfxr-qt = handleTest ./sfxr-qt.nix {};

+51

nixos/tests/seatd.nix

···

       1
       1
       +
       import ./make-test-python.nix ({ pkgs, lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         seatd-test = pkgs.writeShellApplication {

     

       5
       5
       +
           name = "seatd-client-pid";

     

       6
       6
       +
           text = ''

     

       7
       7
       +
             journalctl -u seatd --no-pager -b | while read -r line; do

     

       8
       8
       +
                 case "$line" in

     

       9
       9
       +
                 *"New client connected"*)

     

       10
       10
       +
                     line="''${line##*pid: }"

     

       11
       11
       +
                     pid="''${line%%,*}"

     

       12
       12
       +
                     ;;

     

       13
       13
       +
                 *"Opened client"*)

     

       14
       14
       +
                     echo "$pid"

     

       15
       15
       +
                     exit

     

       16
       16
       +
                 esac

     

       17
       17
       +
             done;

     

       18
       18
       +
           '';

     

       19
       19
       +
         };

     

       20
       20
       +
       in

     

       21
       21
       +
       {

     

       22
       22
       +
         name = "seatd";

     

       23
       23
       +
         meta.maintainers = with lib.maintainers; [ sinanmohd ];

     

       24
       24
       +
       

     

       25
       25
       +
         nodes.machine = { ... }: {

     

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

     

       27
       27
       +
           services.getty.autologinUser = "alice";

     

       28
       28
       +
           users.users.alice.extraGroups = [ "seat" "wheel" ];

     

       29
       29
       +
       

     

       30
       30
       +
           fonts.enableDefaultPackages = true;

     

       31
       31
       +
           environment.systemPackages = with pkgs; [

     

       32
       32
       +
             dwl

     

       33
       33
       +
             foot

     

       34
       34
       +
             seatd-test

     

       35
       35
       +
           ];

     

       36
       36
       +
       

     

       37
       37
       +
           programs.bash.loginShellInit = ''

     

       38
       38
       +
             [ "$(tty)" = "/dev/tty1" ] &&

     

       39
       39
       +
                 dwl -s 'foot touch /tmp/foot_started'

     

       40
       40
       +
           '';

     

       41
       41
       +
       

     

       42
       42
       +
           hardware.opengl.enable = true;

     

       43
       43
       +
           virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];

     

       44
       44
       +
           services.seatd.enable = true;

     

       45
       45
       +
         };

     

       46
       46
       +
       

     

       47
       47
       +
         testScript = ''

     

       48
       48
       +
           machine.wait_for_file("/tmp/foot_started")

     

       49
       49
       +
           machine.succeed("test $(seatd-client-pid) = $(pgrep dwl)")

     

       50
       50
       +
         '';

     

       51
       51
       +
       })

+3 -3

pkgs/applications/misc/oxker/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "oxker";

     

       5
       5
       -
         version = "0.3.3";

     

       5
       5
       +
         version = "0.4.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchCrate {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "sha256-2zdsVItGZYQydpC9E/uCbzOE9Xoh7zTqa9DpxA5qNCc=";

     

       9
       9
       +
           sha256 = "sha256-zre4ccMmv1NWcokLvEFRIf+kornAnge/a3c3b6IO03o=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         cargoHash = "sha256-FXYFQpiK2BGUz9GjsUPS9LWPeezbBQ3A33juoVCl71g=";

     

       12
       12
       +
         cargoHash = "sha256-xdfaTVRt5h4q0kfAE1l6pOXCfk0Cb8TnKNMZeeGvciY=";

     

       13
       13
        
       

     

       14
       14
        
         meta = with lib; {

     

       15
       15
        
           description = "A simple tui to view & control docker containers";

+4 -1

pkgs/applications/misc/seatd/default.nix

···

       6
       6
        
       , scdoc

     

       7
       7
        
       , stdenv

     

       8
       8
        
       , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd

     

       9
       9
       +
       , nixosTests

     

       9
       10
        
       }:

     

       10
       11
        
       

     

       11
       12
        
       stdenv.mkDerivation (finalAttrs: {

     
···

       40
       41
        
           "-Dserver=enabled"

     

       41
       42
        
         ];

     

       42
       43
        
       

     

       44
       44
       +
         passthru.tests.basic = nixosTests.seatd;

     

       45
       45
       +
       

     

       43
       46
        
         meta = {

     

       44
       44
       -
           description = "A universal seat management library";

     

       47
       47
       +
           description = "A minimal seat management daemon, and a universal seat management library";

     

       45
       48
        
           changelog = "https://git.sr.ht/~kennylevinsen/seatd/refs/${finalAttrs.version}";

     

       46
       49
        
           homepage = "https://sr.ht/~kennylevinsen/seatd/";

     

       47
       50
        
           license = lib.licenses.mit;

+2 -2

pkgs/applications/networking/cluster/kubergrunt/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "kubergrunt";

     

       5
       5
       -
         version = "0.12.1";

     

       5
       5
       +
         version = "0.13.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "gruntwork-io";

     

       9
       9
        
           repo = "kubergrunt";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-qd+7tYvRpRMg8Y83L/K8g8fWrfO4rAQj72EpunqfSsc=";

     

       11
       11
       +
           sha256 = "sha256-ZUuMQ0y6qXM9g/snJchqGPf7z+5skE/OPqC3rvRenXo=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorHash = "sha256-AUw1wJNWjpNVsjw/Hr1ZCePYWQkf1SqRVnQgi8tOFG0=";

+8 -4

pkgs/applications/networking/maestral-qt/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , fetchFromGitHub

     

       3
       3
        
       , python3

     

       4
       4
       -
       , qt6

     

       4
       4
       +
       , qtbase

     

       5
       5
       +
       , qtsvg

     

       6
       6
       +
       , qtwayland

     

       5
       7
        
       , nixosTests

     

       8
       8
       +
       , wrapQtAppsHook

     

       6
       9
        
       }:

     

       7
       10
        
       

     

       8
       11
        
       python3.pkgs.buildPythonApplication rec {

     
···

       28
       31
        
         ];

     

       29
       32
        
       

     

       30
       33
        
         buildInputs = [

     

       31
       31
       -
           qt6.qtbase

     

       32
       32
       -
           qt6.qtsvg  # Needed for the systray icon

     

       34
       34
       +
           qtwayland

     

       35
       35
       +
           qtbase

     

       36
       36
       +
           qtsvg  # Needed for the systray icon

     

       33
       37
        
         ];

     

       34
       38
        
       

     

       35
       39
        
         nativeBuildInputs = [

     

       36
       36
       -
           qt6.wrapQtAppsHook

     

       40
       40
       +
           wrapQtAppsHook

     

       37
       41
        
         ];

     

       38
       42
        
       

     

       39
       43
        
         dontWrapQtApps = true;

+4 -1

pkgs/applications/virtualization/singularity/generic.nix

···

       71
       71
        
       , newuidmapPath ? null

     

       72
       72
        
         # Path to SUID-ed newgidmap executable

     

       73
       73
        
       , newgidmapPath ? null

     

       74
       74
       +
         # External LOCALSTATEDIR

     

       75
       75
       +
       , externalLocalStateDir ? null

     

       74
       76
        
         # Remove the symlinks to `singularity*` when projectName != "singularity"

     

       75
       77
        
       , removeCompat ? false

     

       76
       78
        
         # Workaround #86349

     
···

       106
       108
        
           inherit

     

       107
       109
        
             enableSeccomp

     

       108
       110
        
             enableSuid

     

       111
       111
       +
             externalLocalStateDir

     

       109
       112
        
             projectName

     

       110
       113
        
             removeCompat

     

       111
       114
        
             starterSuidPath

     
···

       141
       144
        
         configureScript = "./mconfig";

     

       142
       145
        
       

     

       143
       146
        
         configureFlags = [

     

       144
       144
       -
           "--localstatedir=/var/lib"

     

       147
       147
       +
           "--localstatedir=${if externalLocalStateDir != null then externalLocalStateDir else "${placeholder "out"}/var/lib"}"

     

       145
       148
        
           "--runstatedir=/var/run"

     

       146
       149
        
         ]

     

       147
       150
        
         ++ lib.optional (!enableSeccomp) "--without-seccomp"

+1 -1

pkgs/build-support/singularity-tools/default.nix

···

       111
       111
        
                   touch .${projectName}.d/env/94-appsbase.sh

     

       112
       112
        
       

     

       113
       113
        
                   cd ..

     

       114
       114
       -
                   mkdir -p /var/lib/${projectName}/mnt/{container,final,overlay,session,source}

     

       114
       114
       +
                   mkdir -p /var/lib/${projectName}/mnt/session

     

       115
       115
        
                   echo "root:x:0:0:System administrator:/root:/bin/sh" > /etc/passwd

     

       116
       116
        
                   echo > /etc/resolv.conf

     

       117
       117
        
                   TMPDIR=$(pwd -P) ${projectName} build $out ./img

+3 -3

pkgs/by-name/rq/rqbit/package.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "rqbit";

     

       5
       5
       -
         version = "2.2.2";

     

       5
       5
       +
         version = "3.2.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "ikatson";

     

       9
       9
        
           repo = "rqbit";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           hash = "sha256-9yYHxlvRlO8iJ3SPi0+4lEgBgAaqaDffKChqAe4OsYU=";

     

       11
       11
       +
           hash = "sha256-c0JYFr2yy1lcaJ+xOZnFsGzPVGPoFgCiFTGDlDaHdZk=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoHash = "sha256-dUQiW6J3Wycp5D3mAwGwruU6CkQ534OyP1GdsY7jzEw=";

     

       14
       14
       +
         cargoHash = "sha256-VnkAokOC5xSqO7MVASssKs0EqQ+re5EsEar4eLspTSA=";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];

     

       17
       17

+8 -16

pkgs/development/ocaml-modules/syslog/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, ocaml, findlib }:

     

       1
       1
       +
       { lib, fetchFromGitHub, buildDunePackage }:

     

       2
       2
        
       

     

       3
       3
       -
       assert lib.versionAtLeast (lib.getVersion ocaml) "4.03.0";

     

       3
       3
       +
       buildDunePackage rec {

     

       4
       4
       +
         pname = "syslog";

     

       5
       5
       +
         version = "2.0.2";

     

       4
       6
        
       

     

       5
       5
       -
       stdenv.mkDerivation rec {

     

       6
       6
       -
         pname = "ocaml${ocaml.version}-syslog";

     

       7
       7
       -
         version = "1.5";

     

       7
       7
       +
         minimalOCamlVersion = "4.03";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
       -
           owner = "rixed";

     

       10
       10
       +
           owner = "geneanet";

     

       11
       11
        
           repo = "ocaml-syslog";

     

       12
       12
        
           rev = "v${version}";

     

       13
       13
       -
           sha256 = "1kqpc55ppzv9n555qgqpda49n7nvkqimzisyjx2a7338r7q4r5bw";

     

       13
       13
       +
           hash = "sha256-WybNZBPhv4fhjzzb95E+6ZHcZUnfROLlNF3PMBGO9ys=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         nativeBuildInputs = [ ocaml findlib ];

     

       17
       17
       -
         strictDeps = true;

     

       18
       18
       -
       

     

       19
       19
       -
         buildFlags = [ "all" "opt" ];

     

       20
       20
       -
       

     

       21
       21
       -
         createFindlibDestdir = true;

     

       22
       22
       -
       

     

       23
       16
        
         meta = with lib; {

     

       24
       24
       -
           homepage = "https://github.com/rixed/ocaml-syslog";

     

       17
       17
       +
           homepage = "https://github.com/geneanet/ocaml-syslog";

     

       25
       18
        
           description = "Simple wrapper to access the system logger from OCaml";

     

       26
       19
        
           license = licenses.lgpl21Plus;

     

       27
       27
       -
           inherit (ocaml.meta) platforms;

     

       28
       20
        
           maintainers = [ maintainers.rixed ];

     

       29
       21
        
         };

     

       30
       22
        
       }

+3 -16

pkgs/development/python-modules/bqscales/default.nix

···

       5
       5
        
       , hatchling

     

       6
       6
        
       , hatch-jupyter-builder

     

       7
       7
        
       , jupyterlab

     

       8
       8
       -
       , jupyter-packaging

     

       9
       8
        
       , ipywidgets

     

       10
       9
        
       , numpy

     

       11
       10
        
       , traitlets

     
···

       15
       14
        
       buildPythonPackage rec {

     

       16
       15
        
         pname = "bqscales";

     

       17
       16
        
         version = "0.3.3";

     

       18
       18
       -
         format = "pyproject";

     

       17
       17
       +
         pyproject = true;

     

       19
       18
        
         disabled = pythonOlder "3.6";

     

       20
       19
        
       

     

       21
       20
        
         src = fetchPypi {

     
···

       23
       22
        
           hash = "sha256-SlnNw4dWOzRedwIN3kCyl95qVqkY92QGOMS3Eyoqk0I=";

     

       24
       23
        
         };

     

       25
       24
        
       

     

       26
       26
       -
         # We relax dependencies here instead of pulling in a patch because upstream

     

       27
       27
       -
         # has released a new version using hatch-jupyter-builder, but it is not yet

     

       28
       28
       -
         # trivial to upgrade to that.

     

       29
       29
       -
         #

     

       30
       30
       -
         # Per https://github.com/bqplot/bqscales/issues/76, jupyterlab is not needed

     

       31
       31
       -
         # as a build dependency right now.

     

       32
       32
       -
         #

     

       33
       33
       -
         postPatch = ''

     

       34
       34
       -
           substituteInPlace pyproject.toml \

     

       35
       35
       -
             --replace '"jupyterlab==3.*",' "" \

     

       36
       36
       -
             --replace 'jupyter_packaging~=' 'jupyter_packaging>='

     

       37
       37
       -
         '';

     

       38
       38
       -
       

     

       39
       25
        
         nativeBuildInputs = [

     

       40
       26
        
           hatch-jupyter-builder

     

       41
       27
        
           hatchling

     

       42
       28
        
           jupyterlab

     

       43
       43
       -
           jupyter-packaging

     

       44
       29
        
         ];

     

       45
       30
        
       

     

       46
       31
        
         propagatedBuildInputs = [

     
···

       49
       34
        
           traitlets

     

       50
       35
        
           traittypes

     

       51
       36
        
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         env.SKIP_JUPYTER_BUILDER = 1;

     

       52
       39
        
       

     

       53
       40
        
         # no tests in PyPI dist

     

       54
       41
        
         doCheck = false;

+2 -2

pkgs/development/python-modules/hahomematic/default.nix

···

       18
       18
        
       

     

       19
       19
        
       buildPythonPackage rec {

     

       20
       20
        
         pname = "hahomematic";

     

       21
       21
       -
         version = "2023.11.1";

     

       21
       21
       +
         version = "2023.11.4";

     

       22
       22
        
         format = "pyproject";

     

       23
       23
        
       

     

       24
       24
        
         disabled = pythonOlder "3.11";

     
···

       27
       27
        
           owner = "danielperna84";

     

       28
       28
        
           repo = pname;

     

       29
       29
        
           rev = "refs/tags/${version}";

     

       30
       30
       -
           hash = "sha256-C8KznmR3+G38MLQj6Sek7qW9R9yJr8gfcjgNjDyXG7I=";

     

       30
       30
       +
           hash = "sha256-LB0BGj/DWjHGAFkyACkkzGY1oYNc7hJ2BeT1lHlNjqU=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         postPatch = ''

+3 -3

pkgs/development/python-modules/jupyter-server/default.nix

···

       34
       34
        
       

     

       35
       35
        
       buildPythonPackage rec {

     

       36
       36
        
         pname = "jupyter-server";

     

       37
       37
       -
         version = "2.7.3";

     

       37
       37
       +
         version = "2.10.1";

     

       38
       38
        
         format = "pyproject";

     

       39
       39
        
         disabled = pythonOlder "3.8";

     

       40
       40
        
       

     

       41
       41
        
         src = fetchPypi {

     

       42
       42
        
           pname = "jupyter_server";

     

       43
       43
        
           inherit version;

     

       44
       44
       -
           hash = "sha256-1JFshYHE67xTTOvaqOyiR42fO/3Yjq4p/KsBIOrFdkk=";

     

       44
       44
       +
           hash = "sha256-5tomV6lUp4ee7SjMCOCBewH/2B1+q4Y0ZgOXtV+SZHI=";

     

       45
       45
        
         };

     

       46
       46
        
       

     

       47
       47
        
         nativeBuildInputs = [

     
···

       90
       90
        
         '';

     

       91
       91
        
       

     

       92
       92
        
         disabledTests = [

     

       93
       93
       -
           "test_server_extension_list"

     

       94
       93
        
           "test_cull_idle"

     

       95
       94
        
           "test_server_extension_list"

     

       95
       95
       +
           "test_subscribe_websocket"

     

       96
       96
        
         ] ++ lib.optionals stdenv.isDarwin [

     

       97
       97
        
           # attempts to use trashcan, build env doesn't allow this

     

       98
       98
        
           "test_delete"

+3 -2

pkgs/development/python-modules/pebble/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "pebble";

     

       11
       11
       -
         version = "5.0.3";

     

       11
       11
       +
         version = "5.0.4";

     

       12
       12
        
         format = "setuptools";

     

       13
       13
        
       

     

       14
       14
        
         disabled = pythonOlder "3.7";

     
···

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           pname = "Pebble";

     

       18
       18
        
           inherit version;

     

       19
       19
       -
           hash = "sha256-vc/Z6n4K7biVsgQXfBnm1lQ9mWL040AuurIXUASGPag=";

     

       19
       19
       +
           hash = "sha256-b3rfK97UQUvdNWLV9NVnvZT/EB5yav+HimZXW8mcEis=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeCheckInputs = [

     
···

       32
       32
        
         meta = with lib; {

     

       33
       33
        
           description = "API to manage threads and processes within an application";

     

       34
       34
        
           homepage = "https://github.com/noxdafox/pebble";

     

       35
       35
       +
           changelog = "https://github.com/noxdafox/pebble/releases/tag/${version}";

     

       35
       36
        
           license = licenses.lgpl3Plus;

     

       36
       37
        
           maintainers = with maintainers; [ orivej ];

     

       37
       38
        
         };

+6

pkgs/development/python-modules/plum-py/default.nix

···

       38
       38
        
           "tests"

     

       39
       39
        
         ];

     

       40
       40
        
       

     

       41
       41
       +
         disabledTestPaths = [

     

       42
       42
       +
           # tests enum.IntFlag behaviour which has been disallowed in python 3.11.6

     

       43
       43
       +
           # https://gitlab.com/dangass/plum/-/issues/150

     

       44
       44
       +
           "tests/flag/test_flag_invalid.py"

     

       45
       45
       +
         ];

     

       46
       46
       +
       

     

       41
       47
        
         meta = with lib; {

     

       42
       48
        
           description = "Classes and utilities for packing/unpacking bytes";

     

       43
       49
        
           homepage = "https://plum-py.readthedocs.io/";

-13

pkgs/development/python-modules/polars/all_horizontal.patch

···

       1
       1
       -
       diff --git a/crates/polars-lazy/src/frame/mod.rs b/crates/polars-lazy/src/frame/mod.rs

     

       2
       2
       -
       index 2d2ede651..be24b8809 100644

     

       3
       3
       -
       --- a/crates/polars-lazy/src/frame/mod.rs

     

       4
       4
       -
       +++ b/crates/polars-lazy/src/frame/mod.rs

     

       5
       5
       -
       @@ -25,7 +25,7 @@ pub use parquet::*;

     

       6
       6
       -
        use polars_core::frame::explode::MeltArgs;

     

       7
       7
       -
        use polars_core::prelude::*;

     

       8
       8
       -
        use polars_io::RowCount;

     

       9
       9
       -
       -use polars_plan::dsl::all_horizontal;

     

       10
       10
       -
       +use polars_plan::dsl::functions::all_horizontal;

     

       11
       11
       -
        pub use polars_plan::frame::{AllowedOptimizations, OptState};

     

       12
       12
       -
        use polars_plan::global::FETCH_ROWS;

     

       13
       13
       -
        #[cfg(any(feature = "ipc", feature = "parquet", feature = "csv"))]

-7

pkgs/development/python-modules/polars/default.nix

···

       32
       32
        
         disabled = pythonOlder "3.6";

     

       33
       33
        
         src = rootSource;

     

       34
       34
        
       

     

       35
       35
       -
         patches = [

     

       36
       36
       -
           # workaround for apparent rustc bug

     

       37
       37
       -
           # remove when we're at Rust 1.73

     

       38
       38
       -
           # https://github.com/pola-rs/polars/issues/12050

     

       39
       39
       -
           ./all_horizontal.patch

     

       40
       40
       -
         ];

     

       41
       41
       -
       

     

       42
       35
        
         # Cargo.lock file is sometimes behind actual release which throws an error,

     

       43
       36
        
         # thus the `sed` command

     

       44
       37
        
         # Make sure to check that the right substitutions are made when updating the package

+2 -2

pkgs/development/python-modules/publicsuffixlist/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "publicsuffixlist";

     

       13
       13
       -
         version = "0.10.0.20231121";

     

       13
       13
       +
         version = "0.10.0.20231122";

     

       14
       14
        
         pyproject = true;

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.7";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           hash = "sha256-6Jc12xQchyjXfI0kvvCCBGPNpivsz51izgS/41JrVnQ=";

     

       20
       20
       +
           hash = "sha256-0CrHVPoQTS3I9ZPvf/4wWQX4vYn5vAeWUxNanjnbF60=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [

+2 -2

pkgs/development/python-modules/pytorch-lightning/default.nix

···

       20
       20
        
       

     

       21
       21
        
       buildPythonPackage rec {

     

       22
       22
        
         pname = "pytorch-lightning";

     

       23
       23
       -
         version = "2.1.1";

     

       23
       23
       +
         version = "2.1.2";

     

       24
       24
        
         format = "pyproject";

     

       25
       25
        
       

     

       26
       26
        
         src = fetchFromGitHub {

     

       27
       27
        
           owner = "Lightning-AI";

     

       28
       28
        
           repo = "pytorch-lightning";

     

       29
       29
        
           rev = "refs/tags/${version}";

     

       30
       30
       -
           hash = "sha256-1psTa++qF5WPDVXeDGWfcQ4hGz98uW297QDUKrQyoRE=";

     

       30
       30
       +
           hash = "sha256-d5DKAx67uuIPxtSgazIQnxLiHTBD0lwHaB6LD3R6vKA=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         preConfigure = ''

+2 -2

pkgs/development/python-modules/rollbar/default.nix

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "rollbar";

     

       18
       18
       -
         version = "0.16.3";

     

       18
       18
       +
         version = "1.0.0";

     

       19
       19
        
         format = "setuptools";

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.7";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchPypi {

     

       24
       24
        
           inherit pname version;

     

       25
       25
       -
           hash = "sha256-AjE9/GBxDsc2qwM9D4yWnYV6i5kc1n4MGpFiDooE7eI=";

     

       25
       25
       +
           hash = "sha256-Y0e35J8i8ClvwoemrqddZCz2RJTS7hJwQqelk8l9868=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/trimesh/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "trimesh";

     

       13
       13
       -
         version = "4.0.1";

     

       13
       13
       +
         version = "4.0.4";

     

       14
       14
        
         format = "pyproject";

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.7";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           hash = "sha256-jBVQqYNB8P7E0xkcTH6uYmbBZ/l5P9VLtyyRQxq/fOY=";

     

       20
       20
       +
           hash = "sha256-3XpncG6ISKQU+hqJpvck82s0BYgvYpNGn3zcdWkB5Ps=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ setuptools ];

+1 -1

pkgs/development/python-modules/types-appdirs/default.nix

···

       14
       14
        
       

     

       15
       15
        
         meta = {

     

       16
       16
        
           description = "This is a PEP 561 type stub package for the appdirs package. It can be used by type-checking tools like mypy, pyright, pytype, PyCharm, etc. to check code that uses appdirs. ";

     

       17
       17
       -
           homepage = "https://pypi.org/project/types-appdirss";

     

       17
       17
       +
           homepage = "https://pypi.org/project/types-appdirs";

     

       18
       18
        
           license = lib.licenses.asl20;

     

       19
       19
        
           maintainers = with lib.maintainers; [ ];

     

       20
       20
        
         };

+2 -2

pkgs/servers/home-assistant/stubs.nix

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "homeassistant-stubs";

     

       11
       11
       -
         version = "2023.11.2";

     

       11
       11
       +
         version = "2023.11.3";

     

       12
       12
        
         format = "pyproject";

     

       13
       13
        
       

     

       14
       14
        
         disabled = python.version != home-assistant.python.version;

     
···

       17
       17
        
           owner = "KapJI";

     

       18
       18
        
           repo = "homeassistant-stubs";

     

       19
       19
        
           rev = "refs/tags/${version}";

     

       20
       20
       -
           hash = "sha256-stVfFXb5QfC+wZUSk53+jt/hb8kO1gCcgeOnHHpNlWE=";

     

       20
       20
       +
           hash = "sha256-x3FcUmbUYAUKGAPb85SqJk1kTWFKxpJSX2J+rTRj1KY=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [

+2 -2

pkgs/servers/sql/postgresql/ext/postgis.nix

···

       16
       16
        
       }:

     

       17
       17
        
       stdenv.mkDerivation rec {

     

       18
       18
        
         pname = "postgis";

     

       19
       19
       -
         version = "3.4.0";

     

       19
       19
       +
         version = "3.4.1";

     

       20
       20
        
       

     

       21
       21
        
         outputs = [ "out" "doc" ];

     

       22
       22
        
       

     

       23
       23
        
         src = fetchurl {

     

       24
       24
        
           url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";

     

       25
       25
       -
           sha256 = "sha256-rum2CmyITTVBZLMJbEZX8yRFQYZgf4WdHOBdiZeYr50=";

     

       25
       25
       +
           sha256 = "sha256-/vahQSE9D/J79FszuEnMOWwi3bH/xv7UNUacnokfyB0=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc pcre2.dev ]

+7 -3

pkgs/tools/admin/awscli2/default.nix

···

       19
       19
        
                 hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68=";

     

       20
       20
        
               };

     

       21
       21
        
             });

     

       22
       22
       -
             urllib3 = prev.urllib3.overridePythonAttrs (prev: {

     

       23
       23
       -
               format = "setuptools";

     

       22
       22
       +
             urllib3 = prev.urllib3.overridePythonAttrs (prev: rec {

     

       23
       23
       +
               pyproject = true;

     

       24
       24
       +
               version = "1.26.18";

     

       25
       25
       +
               nativeBuildInputs = with final; [

     

       26
       26
       +
                 setuptools

     

       27
       27
       +
               ];

     

       24
       28
        
               src = prev.src.override {

     

       25
       25
       -
                 version = "1.26.18";

     

       29
       29
       +
                 inherit version;

     

       26
       30
        
                 hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA=";

     

       27
       31
        
               };

     

       28
       32
        
             });

+2 -2

pkgs/tools/misc/parallel/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "parallel";

     

       5
       5
       -
         version = "20230922";

     

       5
       5
       +
         version = "20231022";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2";

     

       9
       9
       -
           sha256 = "sha256-EUR0Ft1eXfZQE897RULhQJOKO/1fPzCVye2xaPy/4GM=";

     

       9
       9
       +
           sha256 = "sha256-k/K5TxhQeYpLXdoiva6G2ramVl41JYYOCORvJWPzJow=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         outputs = [ "out" "man" "doc" ];

+2 -2

pkgs/tools/virtualization/kubevirt/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildGoModule rec {

     

       10
       10
        
         pname = "kubevirt";

     

       11
       11
       -
         version = "1.0.1";

     

       11
       11
       +
         version = "1.1.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "kubevirt";

     

       15
       15
        
           repo = "kubevirt";

     

       16
       16
        
           rev = "v${version}";

     

       17
       17
       -
           sha256 = "sha256-L+spWtYuXq0bPYmE1eGnzTfCAh8Q3j5DUS+k6dNGdOU=";

     

       17
       17
       +
           sha256 = "sha256-dW2rHW/37Jpk3vuu3O87nynK8Mp0IAqpkRvBDxT/++I=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         vendorHash = null;

+1 -1

pkgs/top-level/all-packages.nix

···

       35407
       35407
        
       

     

       35408
       35408
        
         maestral = with python3Packages; toPythonApplication maestral;

     

       35409
       35409
        
       

     

       35410
       35410
       -
         maestral-gui = libsForQt5.callPackage ../applications/networking/maestral-qt { };

     

       35410
       35410
       +
         maestral-gui = qt6.callPackage ../applications/networking/maestral-qt { };

     

       35411
       35411
        
       

     

       35412
       35412
        
         maestro = callPackage ../development/mobile/maestro { };

     

       35413
       35413