commit 3342d1a9a985e9f1456ebdab9fde2514c1716341 · pyrox.dev/nixpkgs

+4 -4

.github/CODEOWNERS

···

       24
       24
        
       # Libraries

     

       25
       25
        
       /lib                        @edolstra @infinisil

     

       26
       26
        
       /lib/systems                @alyssais @ericson2314 @amjoseph-nixpkgs

     

       27
       27
       -
       /lib/generators.nix         @edolstra @Profpatsch

     

       28
       28
       -
       /lib/cli.nix                @edolstra @Profpatsch

     

       29
       29
       -
       /lib/debug.nix              @edolstra @Profpatsch

     

       30
       30
       -
       /lib/asserts.nix            @edolstra @Profpatsch

     

       27
       27
       +
       /lib/generators.nix         @infinisil @edolstra @Profpatsch

     

       28
       28
       +
       /lib/cli.nix                @infinisil @edolstra @Profpatsch

     

       29
       29
       +
       /lib/debug.nix              @infinisil @edolstra @Profpatsch

     

       30
       30
       +
       /lib/asserts.nix            @infinisil @edolstra @Profpatsch

     

       31
       31
        
       /lib/path.*                 @infinisil @fricklerhandwerk

     

       32
       32
        
       /lib/fileset                @infinisil

     

       33
       33
        
       /doc/functions/fileset.section.md @infinisil

+13 -6

maintainers/maintainer-list.nix

···

       2608
       2608
        
           githubId = 200617;

     

       2609
       2609
        
           name = "Ben Sima";

     

       2610
       2610
        
         };

     

       2611
       2611
       -
         bstrik = {

     

       2612
       2612
       -
           email = "dutchman55@gmx.com";

     

       2613
       2613
       -
           github = "bstrik";

     

       2614
       2614
       -
           githubId = 7716744;

     

       2615
       2615
       -
           name = "Berno Strik";

     

       2616
       2616
       -
         };

     

       2617
       2611
        
         btlvr = {

     

       2618
       2612
        
           email = "btlvr@protonmail.com";

     

       2619
       2613
        
           github = "btlvr";

     
···

       3885
       3879
        
           github = "daniyalsuri6";

     

       3886
       3880
        
           githubId = 107034852;

     

       3887
       3881
        
           name = "Daniyal Suri";

     

       3882
       3882
       +
         };

     

       3883
       3883
       +
         dannixon = {

     

       3884
       3884
       +
           email = "dan@dan-nixon.com";

     

       3885
       3885
       +
           github = "DanNixon";

     

       3886
       3886
       +
           githubId = 4037377;

     

       3887
       3887
       +
           name = "Dan Nixon";

     

       3888
       3888
       +
           matrix = "@dannixon:matrix.org";

     

       3888
       3889
        
         };

     

       3889
       3890
        
         dansbandit = {

     

       3890
       3891
        
           github = "dansbandit";

     
···

       14803
       14804
        
           github = "rexim";

     

       14804
       14805
        
           githubId = 165283;

     

       14805
       14806
        
           name = "Alexey Kutepov";

     

       14807
       14807
       +
         };

     

       14808
       14808
       +
         rexxDigital = {

     

       14809
       14809
       +
           email = "joellarssonpriv@gmail.com";

     

       14810
       14810
       +
           github = "rexxDigital";

     

       14811
       14811
       +
           githubId = 44014925;

     

       14812
       14812
       +
           name = "Rexx Larsson";

     

       14806
       14813
        
         };

     

       14807
       14814
        
         rgnns = {

     

       14808
       14815
        
           email = "jglievano@gmail.com";

+1

maintainers/team-list.nix

···

       612
       612
        
       

     

       613
       613
        
         minimal-bootstrap = {

     

       614
       614
        
           members = [

     

       615
       615
       +
             alejandrosame

     

       615
       616
        
             artturin

     

       616
       617
        
             emilytrau

     

       617
       618
        
             ericson2314

+1 -1

nixos/doc/manual/development/activation-script.section.md

···

       69
       69
        
         `/etc/group` and `/etc/shadow`. This also creates home directories

     

       70
       70
        
       - `usrbinenv` creates `/usr/bin/env`

     

       71
       71
        
       - `var` creates some directories in `/var` that are not service-specific

     

       72
       72
       -
       - `wrappers` creates setuid wrappers like `ping` and `sudo`

     

       72
       72
       +
       - `wrappers` creates setuid wrappers like `sudo`

+2

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

···

       347
       347
        
       

     

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

     

       349
       349
        
       

     

       350
       350
       +
       - `services.outline` can now be configured to use local filesystem storage instead of S3 storage using [services.outline.storage.storageType](#opt-services.outline.storage.storageType).

     

       351
       351
       +
       

     

       350
       352
        
       - `buildGoModule` `go-modules` attrs have been renamed to `goModules`.

     

       351
       353
        
       

     

       352
       354
        
       - The `fonts.fonts` and `fonts.enableDefaultFonts` options have been renamed to `fonts.packages` and `fonts.enableDefaultPackages` respectively.

+98 -65

nixos/modules/config/qt.nix

···

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

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       let

     

       6
       6
       -
       

     

       7
       4
        
         cfg = config.qt;

     

       8
       5
        
       

     

       9
       9
       -
         isQGnome = cfg.platformTheme == "gnome" && builtins.elem cfg.style ["adwaita" "adwaita-dark"];

     

       10
       10
       -
         isQtStyle = cfg.platformTheme == "gtk2" && !(builtins.elem cfg.style ["adwaita" "adwaita-dark"]);

     

       11
       11
       -
         isQt5ct = cfg.platformTheme == "qt5ct";

     

       12
       12
       -
         isLxqt = cfg.platformTheme == "lxqt";

     

       13
       13
       -
         isKde = cfg.platformTheme == "kde";

     

       6
       6
       +
         platformPackages = with pkgs; {

     

       7
       7
       +
           gnome = [ qgnomeplatform qgnomeplatform-qt6 ];

     

       8
       8
       +
           gtk2 = [ libsForQt5.qtstyleplugins qt6Packages.qt6gtk2 ];

     

       9
       9
       +
           kde = [ libsForQt5.plasma-integration libsForQt5.systemsettings ];

     

       10
       10
       +
           lxqt = [ lxqt.lxqt-qtplugin lxqt.lxqt-config ];

     

       11
       11
       +
           qt5ct = [ libsForQt5.qt5ct qt6Packages.qt6ct ];

     

       12
       12
       +
         };

     

       14
       13
        
       

     

       15
       15
       -
         packages =

     

       16
       16
       -
           if isQGnome then [

     

       17
       17
       -
             pkgs.qgnomeplatform

     

       18
       18
       -
             pkgs.adwaita-qt

     

       19
       19
       -
             pkgs.qgnomeplatform-qt6

     

       20
       20
       -
             pkgs.adwaita-qt6

     

       21
       21
       -
           ]

     

       22
       22
       -
           else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins pkgs.qt6Packages.qt6gtk2 ]

     

       23
       23
       -
           else if isQt5ct then [ pkgs.libsForQt5.qt5ct pkgs.qt6Packages.qt6ct ]

     

       24
       24
       -
           else if isLxqt then [ pkgs.lxqt.lxqt-qtplugin pkgs.lxqt.lxqt-config ]

     

       25
       25
       -
           else if isKde then [ pkgs.libsForQt5.plasma-integration pkgs.libsForQt5.systemsettings ]

     

       26
       26
       -
           else throw "`qt.platformTheme` ${cfg.platformTheme} and `qt.style` ${cfg.style} are not compatible.";

     

       14
       14
       +
         stylePackages = with pkgs; {

     

       15
       15
       +
           bb10bright = [ libsForQt5.qtstyleplugins ];

     

       16
       16
       +
           bb10dark = [ libsForQt5.qtstyleplugins ];

     

       17
       17
       +
           cde = [ libsForQt5.qtstyleplugins ];

     

       18
       18
       +
           cleanlooks = [ libsForQt5.qtstyleplugins ];

     

       19
       19
       +
           gtk2 = [ libsForQt5.qtstyleplugins qt6Packages.qt6gtk2 ];

     

       20
       20
       +
           motif = [ libsForQt5.qtstyleplugins ];

     

       21
       21
       +
           plastique = [ libsForQt5.qtstyleplugins ];

     

       27
       22
        
       

     

       28
       28
       -
       in

     

       23
       23
       +
           adwaita = [ adwaita-qt adwaita-qt6 ];

     

       24
       24
       +
           adwaita-dark = [ adwaita-qt adwaita-qt6 ];

     

       25
       25
       +
           adwaita-highcontrast = [ adwaita-qt adwaita-qt6 ];

     

       26
       26
       +
           adwaita-highcontrastinverse = [ adwaita-qt adwaita-qt6 ];

     

       29
       27
        
       

     

       28
       28
       +
           breeze = [ libsForQt5.breeze-qt5 ];

     

       29
       29
       +
       

     

       30
       30
       +
           kvantum = [ libsForQt5.qtstyleplugin-kvantum qt6Packages.qtstyleplugin-kvantum ];

     

       31
       31
       +
         };

     

       32
       32
       +
       in

     

       30
       33
        
       {

     

       31
       31
       -
         meta.maintainers = [ maintainers.romildo ];

     

       34
       34
       +
         meta.maintainers = with lib.maintainers; [ romildo thiagokokada ];

     

       32
       35
        
       

     

       33
       36
        
         imports = [

     

       34
       34
       -
           (mkRenamedOptionModule ["qt5" "enable" ] ["qt" "enable" ])

     

       35
       35
       -
           (mkRenamedOptionModule ["qt5" "platformTheme" ] ["qt" "platformTheme" ])

     

       36
       36
       -
           (mkRenamedOptionModule ["qt5" "style" ] ["qt" "style" ])

     

       37
       37
       +
           (lib.mkRenamedOptionModule [ "qt5" "enable" ] [ "qt" "enable" ])

     

       38
       38
       +
           (lib.mkRenamedOptionModule [ "qt5" "platformTheme" ] [ "qt" "platformTheme" ])

     

       39
       39
       +
           (lib.mkRenamedOptionModule [ "qt5" "style" ] [ "qt" "style" ])

     

       37
       40
        
         ];

     

       38
       41
        
       

     

       39
       42
        
         options = {

     

       40
       43
        
           qt = {

     

       44
       44
       +
             enable = lib.mkEnableOption "" // {

     

       45
       45
       +
               description = lib.mdDoc ''

     

       46
       46
       +
                 Whether to enable Qt configuration, including theming.

     

       41
       47
        
       

     

       42
       42
       -
             enable = mkEnableOption (lib.mdDoc "Qt theming configuration");

     

       48
       48
       +
                 Enabling this option is necessary for Qt plugins to work in the

     

       49
       49
       +
                 installed profiles (e.g.: `nix-env -i` or `environment.systemPackages`).

     

       50
       50
       +
               '';

     

       51
       51
       +
             };

     

       43
       52
        
       

     

       44
       44
       -
             platformTheme = mkOption {

     

       45
       45
       -
               type = types.enum [

     

       46
       46
       -
                 "gtk2"

     

       47
       47
       -
                 "gnome"

     

       48
       48
       -
                 "lxqt"

     

       49
       49
       -
                 "qt5ct"

     

       50
       50
       -
                 "kde"

     

       51
       51
       -
               ];

     

       53
       53
       +
             platformTheme = lib.mkOption {

     

       54
       54
       +
               type = with lib.types; nullOr (enum (lib.attrNames platformPackages));

     

       55
       55
       +
               default = null;

     

       52
       56
        
               example = "gnome";

     

       53
       57
        
               relatedPackages = [

     

       54
       58
        
                 "qgnomeplatform"

     

       55
       59
        
                 "qgnomeplatform-qt6"

     

       56
       56
       -
                 ["libsForQt5" "qtstyleplugins"]

     

       57
       57
       -
                 ["libsForQt5" "qt5ct"]

     

       58
       58
       -
                 ["lxqt" "lxqt-qtplugin"]

     

       59
       59
       -
                 ["libsForQt5" "plasma-integration"]

     

       60
       60
       +
                 [ "libsForQt5" "plasma-integration" ]

     

       61
       61
       +
                 [ "libsForQt5" "qt5ct" ]

     

       62
       62
       +
                 [ "libsForQt5" "qtstyleplugins" ]

     

       63
       63
       +
                 [ "libsForQt5" "systemsettings" ]

     

       64
       64
       +
                 [ "lxqt" "lxqt-config" ]

     

       65
       65
       +
                 [ "lxqt" "lxqt-qtplugin" ]

     

       66
       66
       +
                 [ "qt6Packages" "qt6ct" ]

     

       67
       67
       +
                 [ "qt6Packages" "qt6gtk2" ]

     

       60
       68
        
               ];

     

       61
       69
        
               description = lib.mdDoc ''

     

       62
       70
        
                 Selects the platform theme to use for Qt applications.

     

       63
       71
        
       

     

       64
       72
        
                 The options are

     

       65
       65
       -
                 - `gtk`: Use GTK theme with [qtstyleplugins](https://github.com/qt/qtstyleplugins)

     

       66
       73
        
                 - `gnome`: Use GNOME theme with [qgnomeplatform](https://github.com/FedoraQt/QGnomePlatform)

     

       74
       74
       +
                 - `gtk2`: Use GTK theme with [qtstyleplugins](https://github.com/qt/qtstyleplugins)

     

       75
       75
       +
                 - `kde`: Use Qt settings from Plasma.

     

       67
       76
        
                 - `lxqt`: Use LXQt style set using the [lxqt-config-appearance](https://github.com/lxqt/lxqt-config)

     

       68
       77
        
                    application.

     

       69
       78
        
                 - `qt5ct`: Use Qt style set using the [qt5ct](https://sourceforge.net/projects/qt5ct/)

     

       70
       70
       -
                    application.

     

       71
       71
       -
                 - `kde`: Use Qt settings from Plasma.

     

       79
       79
       +
                    and [qt6ct](https://github.com/trialuser02/qt6ct) applications.

     

       72
       80
        
               '';

     

       73
       81
        
             };

     

       74
       82
        
       

     

       75
       75
       -
             style = mkOption {

     

       76
       76
       -
               type = types.enum [

     

       77
       77
       -
                 "adwaita"

     

       78
       78
       -
                 "adwaita-dark"

     

       79
       79
       -
                 "cleanlooks"

     

       80
       80
       -
                 "gtk2"

     

       81
       81
       -
                 "motif"

     

       82
       82
       -
                 "plastique"

     

       83
       83
       -
               ];

     

       83
       83
       +
             style = lib.mkOption {

     

       84
       84
       +
               type = with lib.types; nullOr (enum (lib.attrNames stylePackages));

     

       85
       85
       +
               default = null;

     

       84
       86
        
               example = "adwaita";

     

       85
       87
        
               relatedPackages = [

     

       86
       88
        
                 "adwaita-qt"

     

       87
       89
        
                 "adwaita-qt6"

     

       88
       88
       -
                 ["libsForQt5" "qtstyleplugins"]

     

       89
       89
       -
                 ["qt6Packages" "qt6gtk2"]

     

       90
       90
       +
                 [ "libsForQt5" "breeze-qt5" ]

     

       91
       91
       +
                 [ "libsForQt5" "qtstyleplugin-kvantum" ]

     

       92
       92
       +
                 [ "libsForQt5" "qtstyleplugins" ]

     

       93
       93
       +
                 [ "qt6Packages" "qt6gtk2" ]

     

       94
       94
       +
                 [ "qt6Packages" "qtstyleplugin-kvantum" ]

     

       90
       95
        
               ];

     

       91
       96
        
               description = lib.mdDoc ''

     

       92
       97
        
                 Selects the style to use for Qt applications.

     

       93
       98
        
       

     

       94
       99
        
                 The options are

     

       95
       95
       -
                 - `adwaita`, `adwaita-dark`: Use Adwaita Qt style with

     

       100
       100
       +
                 - `adwaita`, `adwaita-dark`, `adwaita-highcontrast`, `adawaita-highcontrastinverse`:

     

       101
       101
       +
                   Use Adwaita Qt style with

     

       96
       102
        
                   [adwaita](https://github.com/FedoraQt/adwaita-qt)

     

       97
       97
       -
                 - `cleanlooks`, `gtk2`, `motif`, `plastique`: Use styles from

     

       103
       103
       +
                 - `breeze`: Use the Breeze style from

     

       104
       104
       +
                   [breeze](https://github.com/KDE/breeze)

     

       105
       105
       +
                 - `bb10bright`, `bb10dark`, `cleanlooks`, `gtk2`, `motif`, `plastique`:

     

       106
       106
       +
                   Use styles from

     

       98
       107
        
                   [qtstyleplugins](https://github.com/qt/qtstyleplugins)

     

       108
       108
       +
                 - `kvantum`: Use styles from

     

       109
       109
       +
                   [kvantum](https://github.com/tsujan/Kvantum)

     

       99
       110
        
               '';

     

       100
       111
        
             };

     

       101
       112
        
           };

     

       102
       113
        
         };

     

       103
       114
        
       

     

       104
       104
       -
         config = mkIf cfg.enable {

     

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

     

       116
       116
       +
           assertions =

     

       117
       117
       +
             let

     

       118
       118
       +
               gnomeStyles = [

     

       119
       119
       +
                 "adwaita"

     

       120
       120
       +
                 "adwaita-dark"

     

       121
       121
       +
                 "adwaita-highcontrast"

     

       122
       122
       +
                 "adwaita-highcontrastinverse"

     

       123
       123
       +
                 "breeze"

     

       124
       124
       +
               ];

     

       125
       125
       +
             in

     

       126
       126
       +
             [

     

       127
       127
       +
               {

     

       128
       128
       +
                 assertion = cfg.platformTheme == "gnome" -> (builtins.elem cfg.style gnomeStyles);

     

       129
       129
       +
                 message = ''

     

       130
       130
       +
                   `qt.platformTheme` "gnome" must have `qt.style` set to a theme that supports both Qt and Gtk,

     

       131
       131
       +
                   for example: ${lib.concatStringsSep ", " gnomeStyles}.

     

       132
       132
       +
                 '';

     

       133
       133
       +
               }

     

       134
       134
       +
             ];

     

       105
       135
        
       

     

       106
       136
        
           environment.variables = {

     

       107
       107
       -
             QT_QPA_PLATFORMTHEME = cfg.platformTheme;

     

       108
       108
       -
             QT_STYLE_OVERRIDE = mkIf (! (isQt5ct || isLxqt || isKde)) cfg.style;

     

       109
       109
       -
           };

     

       110
       110
       -
       

     

       111
       111
       -
           environment.profileRelativeSessionVariables = let

     

       112
       112
       -
             qtVersions = with pkgs; [ qt5 qt6 ];

     

       113
       113
       -
           in {

     

       114
       114
       -
             QT_PLUGIN_PATH = map (qt: "/${qt.qtbase.qtPluginPrefix}") qtVersions;

     

       115
       115
       -
             QML2_IMPORT_PATH = map (qt: "/${qt.qtbase.qtQmlPrefix}") qtVersions;

     

       137
       137
       +
             QT_QPA_PLATFORMTHEME = lib.mkIf (cfg.platformTheme != null) cfg.platformTheme;

     

       138
       138
       +
             QT_STYLE_OVERRIDE = lib.mkIf (cfg.style != null) cfg.style;

     

       116
       139
        
           };

     

       117
       140
        
       

     

       118
       118
       -
           environment.systemPackages = packages;

     

       141
       141
       +
           environment.profileRelativeSessionVariables =

     

       142
       142
       +
             let

     

       143
       143
       +
               qtVersions = with pkgs; [ qt5 qt6 ];

     

       144
       144
       +
             in

     

       145
       145
       +
             {

     

       146
       146
       +
               QT_PLUGIN_PATH = map (qt: "/${qt.qtbase.qtPluginPrefix}") qtVersions;

     

       147
       147
       +
               QML2_IMPORT_PATH = map (qt: "/${qt.qtbase.qtQmlPrefix}") qtVersions;

     

       148
       148
       +
             };

     

       119
       149
        
       

     

       150
       150
       +
           environment.systemPackages =

     

       151
       151
       +
             lib.optionals (cfg.platformTheme != null) (platformPackages.${cfg.platformTheme})

     

       152
       152
       +
             ++ lib.optionals (cfg.style != null) (stylePackages.${cfg.style});

     

       120
       153
        
         };

     

       121
       154
        
       }

+2 -2

nixos/modules/programs/fish.nix

···

       208
       208
        
               end

     

       209
       209
        
       

     

       210
       210
        
               # if we haven't sourced the login config, do it

     

       211
       211
       -
               status --is-login; and not set -q __fish_nixos_login_config_sourced

     

       211
       211
       +
               status is-login; and not set -q __fish_nixos_login_config_sourced

     

       212
       212
        
               and begin

     

       213
       213
        
                 ${sourceEnv "loginShellInit"}

     

       214
       214
        
       

     
···

       220
       220
        
               end

     

       221
       221
        
       

     

       222
       222
        
               # if we haven't sourced the interactive config, do it

     

       223
       223
       -
               status --is-interactive; and not set -q __fish_nixos_interactive_config_sourced

     

       223
       223
       +
               status is-interactive; and not set -q __fish_nixos_interactive_config_sourced

     

       224
       224
        
               and begin

     

       225
       225
        
                 ${fishAbbrs}

     

       226
       226
        
                 ${fishAliases}

-6

nixos/modules/security/apparmor/profiles.nix

···

       2
       2
        
       let apparmor = config.security.apparmor; in

     

       3
       3
        
       {

     

       4
       4
        
       config.security.apparmor.packages = [ pkgs.apparmor-profiles ];

     

       5
       5
       -
       config.security.apparmor.policies."bin.ping".profile = lib.mkIf apparmor.policies."bin.ping".enable ''

     

       6
       6
       -
         include "${pkgs.iputils.apparmor}/bin.ping"

     

       7
       7
       -
         include "${pkgs.inetutils.apparmor}/bin.ping"

     

       8
       8
       -
         # Note that including those two profiles in the same profile

     

       9
       9
       -
         # would not work if the second one were to re-include <tunables/global>.

     

       10
       10
       -
       '';

     

       11
       5
        
       }

+2 -1

nixos/modules/services/home-automation/home-assistant.nix

···

       588
       588
        
                 "~@privileged"

     

       589
       589
        
               ] ++ optionals (any useComponent componentsUsingPing) [

     

       590
       590
        
                 "capset"

     

       591
       591
       +
                 "setuid"

     

       591
       592
        
               ];

     

       592
       593
        
               UMask = "0077";

     

       593
       594
        
             };

     

       594
       595
        
             path = [

     

       595
       595
       -
               "/run/wrappers" # needed for ping

     

       596
       596
       +
               pkgs.unixtools.ping # needed for ping

     

       596
       597
        
             ];

     

       597
       598
        
           };

     

       598
       599

+37 -13

nixos/modules/services/web-apps/outline.nix

···

       117
       117
        
           storage = lib.mkOption {

     

       118
       118
        
             description = lib.mdDoc ''

     

       119
       119
        
               To support uploading of images for avatars and document attachments an

     

       120
       120
       -
               s3-compatible storage must be provided. AWS S3 is recommended for

     

       120
       120
       +
               s3-compatible storage can be provided. AWS S3 is recommended for

     

       121
       121
        
               redundancy however if you want to keep all file storage local an

     

       122
       122
        
               alternative such as [minio](https://github.com/minio/minio)

     

       123
       123
        
               can be used.

     

       124
       124
       +
               Local filesystem storage can also be used.

     

       124
       125
        
       

     

       125
       125
       -
               A more detailed guide on setting up S3 is available

     

       126
       126
       -
               [here](https://wiki.generaloutline.com/share/125de1cc-9ff6-424b-8415-0d58c809a40f).

     

       126
       126
       +
               A more detailed guide on setting up storage is available

     

       127
       127
       +
               [here](https://docs.getoutline.com/s/hosting/doc/file-storage-N4M0T6Ypu7).

     

       127
       128
        
             '';

     

       128
       129
        
             example = lib.literalExpression ''

     

       129
       130
        
               {

     
···

       136
       137
        
             '';

     

       137
       138
        
             type = lib.types.submodule {

     

       138
       139
        
               options = {

     

       140
       140
       +
                 storageType = lib.mkOption {

     

       141
       141
       +
                   type = lib.types.enum [ "local" "s3" ];

     

       142
       142
       +
                   description = lib.mdDoc "File storage type, it can be local or s3.";

     

       143
       143
       +
                   default = "s3";

     

       144
       144
       +
                 };

     

       145
       145
       +
                 localRootDir = lib.mkOption {

     

       146
       146
       +
                   type = lib.types.str;

     

       147
       147
       +
                   description = lib.mdDoc ''

     

       148
       148
       +
                     If `storageType` is `local`, this sets the parent directory

     

       149
       149
       +
                     under which all attachments/images go.

     

       150
       150
       +
                   '';

     

       151
       151
       +
                   default = "/var/lib/outline/data";

     

       152
       152
       +
                 };

     

       139
       153
        
                 accessKey = lib.mkOption {

     

       140
       154
        
                   type = lib.types.str;

     

       141
       155
        
                   description = lib.mdDoc "S3 access key.";

     
···

       557
       571
        
           systemd.tmpfiles.rules = [

     

       558
       572
        
             "f ${cfg.secretKeyFile} 0600 ${cfg.user} ${cfg.group} -"

     

       559
       573
        
             "f ${cfg.utilsSecretFile} 0600 ${cfg.user} ${cfg.group} -"

     

       560
       560
       -
             "f ${cfg.storage.secretKeyFile} 0600 ${cfg.user} ${cfg.group} -"

     

       574
       574
       +
             (if (cfg.storage.storageType == "s3") then

     

       575
       575
       +
               "f ${cfg.storage.secretKeyFile} 0600 ${cfg.user} ${cfg.group} -"

     

       576
       576
       +
             else

     

       577
       577
       +
               "d ${cfg.storage.localRootDir} 0700 ${cfg.user} ${cfg.group} - -")

     

       561
       578
        
           ];

     

       562
       579
        
       

     

       563
       580
        
           services.postgresql = lib.mkIf (cfg.databaseUrl == "local") {

     
···

       599
       616
        
                 URL = cfg.publicUrl;

     

       600
       617
        
                 PORT = builtins.toString cfg.port;

     

       601
       618
        
       

     

       602
       602
       -
                 AWS_ACCESS_KEY_ID = cfg.storage.accessKey;

     

       603
       603
       -
                 AWS_REGION = cfg.storage.region;

     

       604
       604
       -
                 AWS_S3_UPLOAD_BUCKET_URL = cfg.storage.uploadBucketUrl;

     

       605
       605
       -
                 AWS_S3_UPLOAD_BUCKET_NAME = cfg.storage.uploadBucketName;

     

       606
       606
       -
                 AWS_S3_UPLOAD_MAX_SIZE = builtins.toString cfg.storage.uploadMaxSize;

     

       607
       607
       -
                 AWS_S3_FORCE_PATH_STYLE = builtins.toString cfg.storage.forcePathStyle;

     

       608
       608
       -
                 AWS_S3_ACL = cfg.storage.acl;

     

       609
       609
       -
       

     

       610
       619
        
                 CDN_URL = cfg.cdnUrl;

     

       611
       620
        
                 FORCE_HTTPS = builtins.toString cfg.forceHttps;

     

       612
       621
        
                 ENABLE_UPDATES = builtins.toString cfg.enableUpdateCheck;

     
···

       622
       631
        
                 RATE_LIMITER_ENABLED = builtins.toString cfg.rateLimiter.enable;

     

       623
       632
        
                 RATE_LIMITER_REQUESTS = builtins.toString cfg.rateLimiter.requests;

     

       624
       633
        
                 RATE_LIMITER_DURATION_WINDOW = builtins.toString cfg.rateLimiter.durationWindow;

     

       634
       634
       +
       

     

       635
       635
       +
                 FILE_STORAGE = cfg.storage.storageType;

     

       636
       636
       +
                 FILE_STORAGE_UPLOAD_MAX_SIZE = builtins.toString cfg.storage.uploadMaxSize;

     

       637
       637
       +
                 FILE_STORAGE_LOCAL_ROOT_DIR = cfg.storage.localRootDir;

     

       625
       638
        
               }

     

       639
       639
       +
       

     

       640
       640
       +
               (lib.mkIf (cfg.storage.storageType == "s3") {

     

       641
       641
       +
                 AWS_ACCESS_KEY_ID = cfg.storage.accessKey;

     

       642
       642
       +
                 AWS_REGION = cfg.storage.region;

     

       643
       643
       +
                 AWS_S3_UPLOAD_BUCKET_URL = cfg.storage.uploadBucketUrl;

     

       644
       644
       +
                 AWS_S3_UPLOAD_BUCKET_NAME = cfg.storage.uploadBucketName;

     

       645
       645
       +
                 AWS_S3_FORCE_PATH_STYLE = builtins.toString cfg.storage.forcePathStyle;

     

       646
       646
       +
                 AWS_S3_ACL = cfg.storage.acl;

     

       647
       647
       +
               })

     

       626
       648
        
       

     

       627
       649
        
               (lib.mkIf (cfg.slackAuthentication != null) {

     

       628
       650
        
                 SLACK_CLIENT_ID = cfg.slackAuthentication.clientId;

     
···

       676
       698
        
             script = ''

     

       677
       699
        
               export SECRET_KEY="$(head -n1 ${lib.escapeShellArg cfg.secretKeyFile})"

     

       678
       700
        
               export UTILS_SECRET="$(head -n1 ${lib.escapeShellArg cfg.utilsSecretFile})"

     

       679
       679
       -
               export AWS_SECRET_ACCESS_KEY="$(head -n1 ${lib.escapeShellArg cfg.storage.secretKeyFile})"

     

       701
       701
       +
               ${lib.optionalString (cfg.storage.storageType == "s3") ''

     

       702
       702
       +
                 export AWS_SECRET_ACCESS_KEY="$(head -n1 ${lib.escapeShellArg cfg.storage.secretKeyFile})"

     

       703
       703
       +
               ''}

     

       680
       704
        
               ${lib.optionalString (cfg.slackAuthentication != null) ''

     

       681
       705
        
                 export SLACK_CLIENT_SECRET="$(head -n1 ${lib.escapeShellArg cfg.slackAuthentication.secretFile})"

     

       682
       706
        
               ''}

+1 -1

nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix

···

       49
       49
        
           '';

     

       50
       50
        
         };

     

       51
       51
        
       

     

       52
       52
       -
         checkedSystemdBootBuilder = pkgs.runCommand "systemd-boot" {

     

       52
       52
       +
         checkedSystemdBootBuilder = pkgs.runCommandLocal "systemd-boot" {

     

       53
       53
        
           nativeBuildInputs = [ pkgs.mypy ];

     

       54
       54
        
         } ''

     

       55
       55
        
           install -m755 ${systemdBootBuilder} $out

-22

nixos/modules/tasks/network-interfaces.nix

···

       1406
       1406
        
                 val = tempaddrValues.${opt}.sysctl;

     

       1407
       1407
        
                in nameValuePair "net.ipv6.conf.${replaceStrings ["."] ["/"] i.name}.use_tempaddr" val));

     

       1408
       1408
        
       

     

       1409
       1409
       -
           security.wrappers = {

     

       1410
       1410
       -
             ping = {

     

       1411
       1411
       -
               owner = "root";

     

       1412
       1412
       -
               group = "root";

     

       1413
       1413
       -
               capabilities = "cap_net_raw+p";

     

       1414
       1414
       -
               source = "${pkgs.iputils.out}/bin/ping";

     

       1415
       1415
       -
             };

     

       1416
       1416
       -
           };

     

       1417
       1417
       -
           security.apparmor.policies."bin.ping".profile = lib.mkIf config.security.apparmor.policies."bin.ping".enable (lib.mkAfter ''

     

       1418
       1418
       -
             /run/wrappers/bin/ping {

     

       1419
       1419
       -
               include <abstractions/base>

     

       1420
       1420
       -
               include <nixos/security.wrappers/ping>

     

       1421
       1421
       -
               rpx /run/wrappers/wrappers.*/ping,

     

       1422
       1422
       -
             }

     

       1423
       1423
       -
             /run/wrappers/wrappers.*/ping {

     

       1424
       1424
       -
               include <abstractions/base>

     

       1425
       1425
       -
               include <nixos/security.wrappers/ping>

     

       1426
       1426
       -
               capability net_raw,

     

       1427
       1427
       -
               capability setpcap,

     

       1428
       1428
       -
             }

     

       1429
       1429
       -
           '');

     

       1430
       1430
       -
       

     

       1431
       1409
        
           # Set the host and domain names in the activation script.  Don't

     

       1432
       1410
        
           # clear it if it's not configured in the NixOS configuration,

     

       1433
       1411
        
           # since it may have been set by dhcpcd in the meantime.

+1 -1

nixos/tests/systemd.nix

···

       180
       180
        
       

     

       181
       181
        
           # Do some IP traffic

     

       182
       182
        
           output_ping = machine.succeed(

     

       183
       183
       -
               "systemd-run --wait -- /run/wrappers/bin/ping -c 1 127.0.0.1 2>&1"

     

       183
       183
       +
               "systemd-run --wait -- ping -c 1 127.0.0.1 2>&1"

     

       184
       184
        
           )

     

       185
       185
        
       

     

       186
       186
        
           with subtest("systemd reports accounting data on system.slice"):

+1 -1

pkgs/README.md

···

       362
       362
        
         * If there is no upstream license, `meta.license` should default to `lib.licenses.unfree`.

     

       363
       363
        
         * If in doubt, try to contact the upstream developers for clarification.

     

       364
       364
        
       * `meta.mainProgram` must be set when appropriate.

     

       365
       365
       -
       * `meta.maintainers` should be set.

     

       365
       365
       +
       * `meta.maintainers` must be set for new packages.

     

       366
       366
        
       

     

       367
       367
        
       See the Nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes).

     

       368
       368

+9

pkgs/applications/misc/leetcode-cli/default.nix

···

       2
       2
        
       , fetchCrate

     

       3
       3
        
       , rustPlatform

     

       4
       4
        
       , pkg-config

     

       5
       5
       +
       , installShellFiles

     

       5
       6
        
       , openssl

     

       6
       7
        
       , dbus

     

       7
       8
        
       , sqlite

     
···

       24
       25
        
       

     

       25
       26
        
         nativeBuildInputs = [

     

       26
       27
        
           pkg-config

     

       28
       28
       +
           installShellFiles

     

       27
       29
        
         ];

     

       28
       30
        
       

     

       29
       31
        
         buildInputs = [

     
···

       31
       33
        
           dbus

     

       32
       34
        
           sqlite

     

       33
       35
        
         ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];

     

       36
       36
       +
       

     

       37
       37
       +
         postInstall = ''

     

       38
       38
       +
           installShellCompletion --cmd leetcode \

     

       39
       39
       +
             --bash <($out/bin/leetcode completions bash) \

     

       40
       40
       +
             --fish <($out/bin/leetcode completions fish) \

     

       41
       41
       +
             --zsh <($out/bin/leetcode completions zsh)

     

       42
       42
       +
         '';

     

       34
       43
        
       

     

       35
       44
        
         passthru.tests = testers.testVersion {

     

       36
       45
        
           package = leetcode-cli;

+2 -2

pkgs/applications/misc/slweb/default.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation (finalAttrs: {

     

       9
       9
        
         pname = "slweb";

     

       10
       10
       -
         version = "0.6.11";

     

       10
       10
       +
         version = "0.9.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromSourcehut {

     

       13
       13
        
           owner = "~strahinja";

     

       14
       14
        
           repo = "slweb";

     

       15
       15
        
           rev = "v${finalAttrs.version}";

     

       16
       16
       -
           hash = "sha256-+bKapK/s1pmo1NRRslf7V4ogWTtchFNWpzi+S8YG6+4=";

     

       16
       16
       +
           hash = "sha256-QDHcp5pCmapgOlJpDDyyC12JOfh/biDyF6O+iKGbOGg=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ redo-apenwarr ];

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildGoModule rec {

     

       11
       11
        
         pname = "kaniko";

     

       12
       12
       -
         version = "1.16.0";

     

       12
       12
       +
         version = "1.17.0";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "GoogleContainerTools";

     

       16
       16
        
           repo = "kaniko";

     

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

     

       18
       18
       -
           hash = "sha256-PTcPlYJ0IHWNQKBJcMiotGp6GPH3qY3f6sJKgUVSTZU=";

     

       18
       18
       +
           hash = "sha256-O4FPz62QnvG+Q2l4Gr/O0XFpkXE2G4RO/G6KNDdanzk=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         vendorHash = null;

+2 -2

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

···

       20
       20
        
       

     

       21
       21
        
       buildGoModule rec {

     

       22
       22
        
         pname = "kubernetes";

     

       23
       23
       -
         version = "1.28.2";

     

       23
       23
       +
         version = "1.28.3";

     

       24
       24
        
       

     

       25
       25
        
         src = fetchFromGitHub {

     

       26
       26
        
           owner = "kubernetes";

     

       27
       27
        
           repo = "kubernetes";

     

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

     

       29
       29
       -
           hash = "sha256-7juoX4nFvQbIIbhTlnIYVUEYUJGwu+aKrpw4ltujjXI=";

     

       29
       29
       +
           hash = "sha256-lb9FAk3b6J92viyHzLCzbYRxhQS94/FQvDr1m1kdTq8=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         vendorHash = null;

+3 -3

pkgs/applications/networking/sync/storj-uplink/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "storj-uplink";

     

       8
       8
       -
         version = "1.89.2";

     

       8
       8
       +
         version = "1.90.1";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "storj";

     

       12
       12
        
           repo = "storj";

     

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

     

       14
       14
       -
           hash = "sha256-tbzdfKA3ojwTvJ+t7jLLy3iKQ/x/0lXDcb2w1XcyEhs=";

     

       14
       14
       +
           hash = "sha256-LJtNsemNbN+TLyUxSgB/wftKxOfI/y/t+qv1TjcsXzQ=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         subPackages = [ "cmd/uplink" ];

     

       18
       18
        
       

     

       19
       19
       -
         vendorHash = "sha256-AME5EM2j7PQ/DodK+3BiVepTRbwMqqItQbmCJ2lrGM8=";

     

       19
       19
       +
         vendorHash = "sha256-R713WhFrWT7Cgstk3SLuvvyk3/ZtT1LOH0qqmFcWzKw=";

     

       20
       20
        
       

     

       21
       21
        
         ldflags = [ "-s" "-w" ];

     

       22
       22

+3 -3

pkgs/by-name/ez/eza/package.nix

···

       17
       17
        
       

     

       18
       18
        
       rustPlatform.buildRustPackage rec {

     

       19
       19
        
         pname = "eza";

     

       20
       20
       -
         version = "0.14.2";

     

       20
       20
       +
         version = "0.15.0";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "eza-community";

     

       24
       24
        
           repo = "eza";

     

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

     

       26
       26
       -
           hash = "sha256-eST70KMdGgbTo4FNL3K5YGn9lwIGroG4y4ExKDb30hU=";

     

       26
       26
       +
           hash = "sha256-52vBN/EdO0R2Lt/Iv33Odl437I8kgUhxXwtUuiaAcAU=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
       -
         cargoHash = "sha256-h5ooNR0IeXWyY6PuZM/bQLkX4F0eZsEY2eoIgo0nRFA=";

     

       29
       29
       +
         cargoHash = "sha256-j6FsI6FpBXtaNcVDY84UBcqifXuJxBRW5Gdln8pq7Iw=";

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];

     

       32
       32
        
         buildInputs = [ zlib ]

+23

pkgs/by-name/re/reactphysics3d/package.nix

···

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, cmake }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation (finalAttrs: {

     

       4
       4
       +
         pname = "reactphysics3d";

     

       5
       5
       +
         version = "0.9.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "DanielChappuis";

     

       9
       9
       +
           repo = "reactphysics3d";

     

       10
       10
       +
           rev = "v${finalAttrs.version}";

     

       11
       11
       +
           hash = "sha256-AUdsUXsygsGfS8H+AHEV1fSrrX7zGmfsaTONYUG3zqk=";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         nativeBuildInputs = [ cmake ];

     

       15
       15
       +
       

     

       16
       16
       +
         meta = with lib; {

     

       17
       17
       +
           description = "An open source C++ physics engine library";

     

       18
       18
       +
           homepage = "https://www.reactphysics3d.com";

     

       19
       19
       +
           maintainers = with maintainers; [ rexxDigital ];

     

       20
       20
       +
           license = licenses.zlib;

     

       21
       21
       +
           platforms = platforms.all;

     

       22
       22
       +
         };

     

       23
       23
       +
       })

+31 -22

pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix

···

       1
       1
       -
       { lib, stdenv, dockapps-sources, pkg-config, libX11, libXpm, libXext, alsa-lib }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , alsa-lib

     

       4
       4
       +
       , dockapps-sources

     

       5
       5
       +
       , libX11

     

       6
       6
       +
       , libXext

     

       7
       7
       +
       , libXpm

     

       8
       8
       +
       , pkg-config

     

       9
       9
       +
       }:

     

       2
       10
        
       

     

       3
       3
       -
       stdenv.mkDerivation rec {

     

       11
       11
       +
       stdenv.mkDerivation (finalAttrs: {

     

       4
       12
        
         pname = "AlsaMixer.app";

     

       5
       5
       -
         version = "0.2.1";

     

       13
       13
       +
       

     

       14
       14
       +
         inherit (dockapps-sources) version src;

     

       6
       15
        
       

     

       7
       7
       -
         src = dockapps-sources;

     

       16
       16
       +
         sourceRoot = "${finalAttrs.src.name}/AlsaMixer.app";

     

       17
       17
       +
       

     

       18
       18
       +
         nativeBuildInputs = [

     

       19
       19
       +
           pkg-config

     

       20
       20
       +
         ];

     

       8
       21
        
       

     

       9
       9
       -
         nativeBuildInputs = [ pkg-config ];

     

       10
       10
       -
         buildInputs = [ libX11 libXpm libXext alsa-lib ];

     

       22
       22
       +
         buildInputs = [

     

       23
       23
       +
           alsa-lib

     

       24
       24
       +
           libX11

     

       25
       25
       +
           libXpm

     

       26
       26
       +
           libXext

     

       27
       27
       +
         ];

     

       11
       28
        
       

     

       12
       12
       -
         setSourceRoot = ''

     

       13
       13
       -
           export sourceRoot=$(echo */${pname})

     

       14
       14
       -
         '';

     

       29
       29
       +
         hardeningDisable = [ "fortify" ];

     

       15
       30
        
       

     

       16
       31
        
         dontConfigure = true;

     

       17
       32
        
       

     

       18
       18
       -
         preInstall = ''

     

       19
       19
       -
           install -d ${placeholder "out"}/bin

     

       20
       20
       -
         '';

     

       21
       21
       -
       

     

       22
       33
        
         installPhase = ''

     

       23
       34
        
           runHook preInstall

     

       24
       24
       -
           install -t ${placeholder "out"}/bin AlsaMixer.app

     

       35
       35
       +
           install -D -t ${placeholder "out"}/bin/ AlsaMixer.app

     

       36
       36
       +
           pushd ${placeholder "out"}/bin

     

       37
       37
       +
           ln -vs AlsaMixer.app AlsaMixer

     

       25
       38
        
           runHook postInstall

     

       26
       39
        
         '';

     

       27
       40
        
       

     

       28
       28
       -
         postInstall = ''

     

       29
       29
       -
           ln -s ${placeholder "out"}/bin/AlsaMixer.app ${placeholder "out"}/bin/AlsaMixer

     

       30
       30
       -
         '';

     

       31
       31
       -
       

     

       32
       32
       -
         meta = with lib; {

     

       41
       41
       +
         meta = {

     

       33
       42
        
           description = "Alsa mixer application for Windowmaker";

     

       34
       43
        
           homepage = "https://www.dockapps.net/alsamixerapp";

     

       35
       35
       -
           license = licenses.gpl2Plus;

     

       36
       36
       -
           maintainers = [ maintainers.bstrik ];

     

       44
       44
       +
           license = lib.licenses.gpl2Plus;

     

       45
       45
       +
           maintainers = [ ];

     

       37
       46
        
         };

     

       38
       38
       -
       }

     

       47
       47
       +
       })

+46

pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , dockapps-sources

     

       4
       4
       +
       , libX11

     

       5
       5
       +
       , libXext

     

       6
       6
       +
       , libXpm

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       stdenv.mkDerivation (finalAttrs: {

     

       10
       10
       +
         pname = "cputnik";

     

       11
       11
       +
       

     

       12
       12
       +
         inherit (dockapps-sources) version src;

     

       13
       13
       +
       

     

       14
       14
       +
         sourceRoot = "${finalAttrs.src.name}/cputnik/src";

     

       15
       15
       +
       

     

       16
       16
       +
         buildInputs = [

     

       17
       17
       +
           libX11

     

       18
       18
       +
           libXpm

     

       19
       19
       +
           libXext

     

       20
       20
       +
         ];

     

       21
       21
       +
       

     

       22
       22
       +
         preBuild = ''

     

       23
       23
       +
           makeFlagsArray+=(

     

       24
       24
       +
             INCS="-I${libX11.dev}/include -I${libXext.dev}/include -I${libXpm.dev}/include"

     

       25
       25
       +
             LIBS="-L${libX11}/lib -L${libXext}/lib -L${libXpm}/lib -lX11 -lXpm -lXext"

     

       26
       26
       +
           )

     

       27
       27
       +
         '';

     

       28
       28
       +
       

     

       29
       29
       +
         hardeningDisable = [ "format" ];

     

       30
       30
       +
       

     

       31
       31
       +
         installPhase = ''

     

       32
       32
       +
           runHook preInstall

     

       33
       33
       +
       

     

       34
       34
       +
           install -Dm755 -t $out/bin/ cputnik

     

       35
       35
       +
       

     

       36
       36
       +
           runHook postInstall

     

       37
       37
       +
         '';

     

       38
       38
       +
       

     

       39
       39
       +
         meta = {

     

       40
       40
       +
           description = "A Calendar clock with antialiased text";

     

       41
       41
       +
           homepage = "https://www.dockapps.net/wmcalclock";

     

       42
       42
       +
           license = lib.licenses.gpl2Plus;

     

       43
       43
       +
           maintainers = [ ];

     

       44
       44
       +
           platforms = lib.platforms.linux;

     

       45
       45
       +
         };

     

       46
       46
       +
       })

+19 -10

pkgs/by-name/wi/windowmaker/dockapps/default.nix

···

       1
       1
        
       { config, lib, pkgs }:

     

       2
       2
        
       

     

       3
       3
       -
       lib.makeScope pkgs.newScope (self: with self; {

     

       3
       3
       +
       lib.makeScope pkgs.newScope (self: {

     

       4
       4
        
       

     

       5
       5
       -
         dockapps-sources = pkgs.fetchgit {

     

       6
       6
       -
           url = "https://repo.or.cz/dockapps.git";

     

       7
       7
       -
           rev = "b2b9d872ee61c9b329e4597c301e4417cbd9c3ea";

     

       8
       8
       -
           sha256 = "sha256-BuSnwPIj3gUWMjj++SK+117xm/77u4gXLQzRFttei0w=";

     

       5
       5
       +
         dockapps-sources = {

     

       6
       6
       +
           pname = "dockapps-sources";

     

       7
       7
       +
           version = "2023-10-11"; # Shall correspond to src.rev

     

       8
       8
       +
       

     

       9
       9
       +
           src = pkgs.fetchFromRepoOrCz {

     

       10
       10
       +
             repo = "dockapps";

     

       11
       11
       +
             rev = "1bbb32008ecb58acaec9ea70e00b4ea1735408fc";

     

       12
       12
       +
             hash = "sha256-BLUDe/cIIuh9mCtafbcBSDatUXSRD83FeyYhcbem5FU=";

     

       13
       13
       +
           };

     

       9
       14
        
         };

     

       10
       15
        
       

     

       11
       11
       -
         libdockapp = callPackage ./libdockapp.nix { };

     

       16
       16
       +
         AlsaMixer-app = self.callPackage ./AlsaMixer-app.nix { };

     

       12
       17
        
       

     

       13
       13
       -
         AlsaMixer-app = callPackage ./AlsaMixer-app.nix { };

     

       18
       18
       +
         cputnik = self.callPackage ./cputnik.nix { };

     

       14
       19
        
       

     

       15
       15
       -
         wmCalClock = callPackage ./wmCalClock.nix { };

     

       20
       20
       +
         libdockapp = self.callPackage ./libdockapp.nix { };

     

       16
       21
        
       

     

       17
       17
       -
         wmsm-app = callPackage ./wmsm-app.nix { };

     

       22
       22
       +
         wmCalClock = self.callPackage ./wmCalClock.nix { };

     

       18
       23
        
       

     

       19
       19
       -
         wmsystemtray = callPackage ./wmsystemtray.nix { };

     

       24
       24
       +
         wmcube = self.callPackage ./wmcube.nix { };

     

       25
       25
       +
       

     

       26
       26
       +
         wmsm-app = self.callPackage ./wmsm-app.nix { };

     

       27
       27
       +
       

     

       28
       28
       +
         wmsystemtray = self.callPackage ./wmsystemtray.nix { };

     

       20
       29
        
       })

+19 -13

pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix

···

       1
       1
       -
       { lib, stdenv, dockapps-sources, autoreconfHook, pkg-config

     

       2
       2
       -
       , libX11, libXext, libXpm, mkfontdir, fontutil }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , autoreconfHook

     

       4
       4
       +
       , dockapps-sources

     

       5
       5
       +
       , fontutil

     

       6
       6
       +
       , libX11

     

       7
       7
       +
       , libXext

     

       8
       8
       +
       , libXpm

     

       9
       9
       +
       , mkfontdir

     

       10
       10
       +
       , pkg-config

     

       11
       11
       +
       }:

     

       3
       12
        
       

     

       4
       4
       -
       stdenv.mkDerivation rec {

     

       13
       13
       +
       stdenv.mkDerivation (finalAttrs: {

     

       5
       14
        
         pname = "libdockapp";

     

       6
       6
       -
         version = "0.7.3";

     

       7
       15
        
       

     

       8
       8
       -
         src = dockapps-sources;

     

       16
       16
       +
         inherit (dockapps-sources) version src;

     

       17
       17
       +
       

     

       18
       18
       +
         sourceRoot = "${finalAttrs.src.name}/libdockapp";

     

       9
       19
        
       

     

       10
       20
        
         nativeBuildInputs = [ autoreconfHook pkg-config ];

     

       11
       21
        
       

     

       12
       22
        
         buildInputs = [ libX11 libXext libXpm fontutil mkfontdir ];

     

       13
       13
       -
       

     

       14
       14
       -
         setSourceRoot = ''

     

       15
       15
       -
           export sourceRoot=$(echo */${pname})

     

       16
       16
       -
         '';

     

       17
       23
        
       

     

       18
       24
        
         # There is a bug on --with-font

     

       19
       25
        
         configureFlags = [

     
···

       21
       27
        
           "--with-font=no"

     

       22
       28
        
         ];

     

       23
       29
        
       

     

       24
       24
       -
         meta = with lib; {

     

       30
       30
       +
         meta = {

     

       25
       31
        
           description = "A library providing a framework for dockapps";

     

       26
       32
        
           homepage = "https://www.dockapps.net/libdockapp";

     

       27
       27
       -
           license = licenses.gpl2Plus;

     

       28
       28
       -
           maintainers = [ maintainers.bstrik ];

     

       33
       33
       +
           license = lib.licenses.gpl2Plus;

     

       34
       34
       +
           maintainers = [ ];

     

       29
       35
        
         };

     

       30
       30
       -
       }

     

       36
       36
       +
       })

+20 -14

pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix

···

       1
       1
       -
       { lib, stdenv, dockapps-sources

     

       2
       2
       -
       , libX11, libXpm, libXext }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , dockapps-sources

     

       4
       4
       +
       , libX11

     

       5
       5
       +
       , libXext

     

       6
       6
       +
       , libXpm

     

       7
       7
       +
       }:

     

       3
       8
        
       

     

       4
       4
       -
       stdenv.mkDerivation rec {

     

       9
       9
       +
       stdenv.mkDerivation (finalAttrs: {

     

       5
       10
        
         pname = "wmCalClock";

     

       6
       6
       -
         version = "1.25";

     

       7
       11
        
       

     

       8
       8
       -
         src = dockapps-sources;

     

       12
       12
       +
         inherit (dockapps-sources) version src;

     

       9
       13
        
       

     

       10
       10
       -
         buildInputs = [ libX11 libXpm libXext ];

     

       14
       14
       +
         sourceRoot = "${finalAttrs.src.name}/wmCalClock";

     

       11
       15
        
       

     

       12
       12
       -
         setSourceRoot = ''

     

       13
       13
       -
           export sourceRoot=$(echo */${pname}/Src)

     

       14
       14
       -
         '';

     

       16
       16
       +
         buildInputs = [

     

       17
       17
       +
           libX11

     

       18
       18
       +
           libXpm

     

       19
       19
       +
           libXext

     

       20
       20
       +
         ];

     

       15
       21
        
       

     

       16
       22
        
         preBuild = ''

     

       17
       23
        
           makeFlagsArray+=(

     
···

       28
       34
        
       

     

       29
       35
        
         installFlags = [ "DESTDIR=${placeholder "out"}" ];

     

       30
       36
        
       

     

       31
       31
       -
         meta = with lib; {

     

       37
       37
       +
         meta = {

     

       32
       38
        
           description = "A Calendar clock with antialiased text";

     

       33
       39
        
           homepage = "https://www.dockapps.net/wmcalclock";

     

       34
       34
       -
           license = licenses.gpl2Plus;

     

       35
       35
       -
           maintainers = [ maintainers.bstrik ];

     

       36
       36
       -
           platforms = platforms.linux;

     

       40
       40
       +
           license = lib.licenses.gpl2Plus;

     

       41
       41
       +
           maintainers = [ ];

     

       42
       42
       +
           platforms = lib.platforms.linux;

     

       37
       43
        
         };

     

       38
       38
       -
       }

     

       44
       44
       +
       })

+48

pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , dockapps-sources

     

       4
       4
       +
       , libX11

     

       5
       5
       +
       , libXpm

     

       6
       6
       +
       , libXext

     

       7
       7
       +
       , libdockapp

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       stdenv.mkDerivation (finalAttrs: {

     

       11
       11
       +
         pname = "wmcube";

     

       12
       12
       +
       

     

       13
       13
       +
         inherit (dockapps-sources) version src;

     

       14
       14
       +
       

     

       15
       15
       +
         sourceRoot = "${finalAttrs.src.name}/wmcube/wmcube";

     

       16
       16
       +
       

     

       17
       17
       +
         buildInputs = [

     

       18
       18
       +
           libX11

     

       19
       19
       +
           libXext

     

       20
       20
       +
           libXpm

     

       21
       21
       +
           libdockapp

     

       22
       22
       +
         ];

     

       23
       23
       +
       

     

       24
       24
       +
         env.NIX_CFLAGS_COMPILE = "-std=gnu89";

     

       25
       25
       +
       

     

       26
       26
       +
         preBuild = ''

     

       27
       27
       +
           makeFlagsArray=(

     

       28
       28
       +
             CC="${stdenv.cc.targetPrefix}cc"

     

       29
       29
       +
             PREFIX="${placeholder "out"}"

     

       30
       30
       +
             VERSION="${finalAttrs.version}"

     

       31
       31
       +
             LIBDIR="-L${lib.getLib libX11}/lib -L${lib.getLib libXext}/lib \

     

       32
       32
       +
       -L${lib.getLib libXpm}/lib -L${lib.getLib libdockapp}/lib"

     

       33
       33
       +
             INCDIR="-I${lib.getDev libX11}/lib -I${lib.getDev libXext}/lib \

     

       34
       34
       +
       -I${lib.getDev libXpm}/lib -I${lib.getDev libdockapp}/lib"

     

       35
       35
       +
             LIBS="-lm -lXpm -lXext -lX11 -ldockapp"

     

       36
       36
       +
           )

     

       37
       37
       +
         '';

     

       38
       38
       +
       

     

       39
       39
       +
         preInstall = ''

     

       40
       40
       +
           mkdir -pv $out/{bin,doc/wmcube-${finalAttrs.version},share/wmcube,man/man1}

     

       41
       41
       +
         '';

     

       42
       42
       +
       

     

       43
       43
       +
         meta = {

     

       44
       44
       +
           description = "System monitor for Windowmaker";

     

       45
       45
       +
           license = lib.licenses.gpl2Plus;

     

       46
       46
       +
           maintainers = [ ];

     

       47
       47
       +
         };

     

       48
       48
       +
       })

+24 -15

pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix

···

       1
       1
       -
       { lib, stdenv, dockapps-sources

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , dockapps-sources

     

       2
       4
        
       , libX11

     

       3
       5
        
       , libXpm

     

       4
       6
        
       , libXext

     

       5
       5
       -
       , libdockapp }:

     

       7
       7
       +
       , libdockapp

     

       8
       8
       +
       }:

     

       6
       9
        
       

     

       7
       7
       -
       stdenv.mkDerivation rec {

     

       10
       10
       +
       stdenv.mkDerivation  (finalAttrs: {

     

       8
       11
        
         pname = "wmsm.app";

     

       9
       9
       -
         version = "0.2.1";

     

       10
       12
        
       

     

       11
       11
       -
         src = dockapps-sources;

     

       13
       13
       +
         inherit (dockapps-sources) version src;

     

       12
       14
        
       

     

       13
       13
       -
         buildInputs = [ libX11 libXpm libXext libdockapp ];

     

       15
       15
       +
         sourceRoot = "${src.name}/wmsm.app/wmsm";

     

       14
       16
        
       

     

       15
       15
       -
         setSourceRoot = ''

     

       16
       16
       -
           export sourceRoot=$(echo */${pname}/wmsm)

     

       17
       17
       -
         '';

     

       17
       17
       +
         buildInputs = [

     

       18
       18
       +
           libX11

     

       19
       19
       +
           libXext

     

       20
       20
       +
           libXpm

     

       21
       21
       +
           libdockapp

     

       22
       22
       +
         ];

     

       18
       23
        
       

     

       19
       24
        
         env.NIX_CFLAGS_COMPILE = "-std=gnu89";

     

       20
       25
        
       

     
···

       24
       29
        
             --replace "/usr/bin/install" "install"

     

       25
       30
        
         '';

     

       26
       31
        
       

     

       27
       27
       -
         makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];

     

       32
       32
       +
         makeFlags = [

     

       33
       33
       +
           "CC=${stdenv.cc.targetPrefix}cc"

     

       34
       34
       +
         ];

     

       28
       35
        
       

     

       29
       36
        
         installPhase = ''

     

       30
       37
        
           runHook preInstall

     
···

       32
       39
        
           runHook postInstall

     

       33
       40
        
         '';

     

       34
       41
        
       

     

       35
       35
       -
         installFlags = [ "PREFIX=${placeholder "out"}/bin" ];

     

       42
       42
       +
         installFlags = [

     

       43
       43
       +
           "PREFIX=${placeholder "out"}/bin"

     

       44
       44
       +
         ];

     

       36
       45
        
       

     

       37
       37
       -
         meta = with lib; {

     

       46
       46
       +
         meta = {

     

       38
       47
        
           description = "System monitor for Windowmaker";

     

       39
       48
        
           homepage = "https://www.dockapps.net/wmsmapp";

     

       40
       40
       -
           license = licenses.gpl2;

     

       41
       41
       -
           maintainers = [ maintainers.bstrik ];

     

       49
       49
       +
           license = lib.licenses.gpl2Plus;

     

       50
       50
       +
           maintainers = [ ];

     

       42
       51
        
         };

     

       43
       43
       -
       }

     

       52
       52
       +
       })

+27 -9

pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, pkg-config, libX11, libXpm, libXext, libXfixes, libXmu }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchurl

     

       4
       4
       +
       , libX11

     

       5
       5
       +
       , libXext

     

       6
       6
       +
       , libXfixes

     

       7
       7
       +
       , libXmu

     

       8
       8
       +
       , libXpm

     

       9
       9
       +
       , pkg-config

     

       10
       10
       +
       }:

     

       2
       11
        
       

     

       3
       3
       -
       stdenv.mkDerivation rec {

     

       12
       12
       +
       stdenv.mkDerivation (finalAttrs: {

     

       4
       13
        
         pname = "wmsystemtray";

     

       5
       14
        
         version = "1.4";

     

       6
       15
        
       

     

       7
       16
        
         src = fetchurl {

     

       8
       8
       -
           url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}.tar.gz";

     

       9
       9
       -
            sha256 = "sha256-jt70NpHp//BxAA4pFmx8GtQgwJVukGgVEGHogcisl+k=";

     

       17
       17
       +
           url = "mirror://sourceforge/project/wmsystemtray/wmsystemtray/wmsystemtray-${finalAttrs.version}.tar.gz";

     

       18
       18
       +
           hash = "sha256-jt70NpHp//BxAA4pFmx8GtQgwJVukGgVEGHogcisl+k=";

     

       10
       19
        
         };

     

       11
       20
        
       

     

       12
       12
       -
         nativeBuildInputs = [ pkg-config ];

     

       13
       13
       -
         buildInputs = [ libX11 libXpm libXext libXfixes libXmu ];

     

       21
       21
       +
         nativeBuildInputs = [

     

       22
       22
       +
           pkg-config

     

       23
       23
       +
         ];

     

       14
       24
        
       

     

       15
       15
       -
         meta = with lib; {

     

       25
       25
       +
         buildInputs = [

     

       26
       26
       +
           libX11

     

       27
       27
       +
           libXext

     

       28
       28
       +
           libXfixes

     

       29
       29
       +
           libXmu

     

       30
       30
       +
           libXpm

     

       31
       31
       +
         ];

     

       32
       32
       +
       

     

       33
       33
       +
         meta = {

     

       16
       34
        
           description = "A system tray for Windowmaker";

     

       17
       35
        
           homepage = "http://wmsystemtray.sourceforge.net";

     

       18
       36
        
           license = licenses.gpl2Only;

     

       19
       19
       -
           maintainers = [ maintainers.bstrik ];

     

       37
       37
       +
           maintainers = [ ];

     

       20
       38
        
           platforms = platforms.linux;

     

       21
       39
        
         };

     

       22
       22
       -
       }

     

       40
       40
       +
       })

+5

pkgs/by-name/wi/windowmaker/package.nix

···

       2
       2
        
       , stdenv

     

       3
       3
        
       , fetchFromRepoOrCz

     

       4
       4
        
       , autoreconfHook

     

       5
       5
       +
       , callPackage

     

       5
       6
        
       , pkg-config

     

       6
       7
        
       , imagemagick

     

       7
       8
        
       , libX11

     
···

       61
       62
        
           "--enable-webp"

     

       62
       63
        
           "--with-x"

     

       63
       64
        
         ];

     

       65
       65
       +
       

     

       66
       66
       +
         passthru = {

     

       67
       67
       +
           dockapps = callPackage ./dockapps { };

     

       68
       68
       +
         };

     

       64
       69
        
       

     

       65
       70
        
         meta = {

     

       66
       71
        
           homepage = "http://windowmaker.org/";

+2 -2

pkgs/data/fonts/sketchybar-app-font/default.nix

···

       5
       5
        
       

     

       6
       6
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       7
       7
        
         pname = "sketchybar-app-font";

     

       8
       8
       -
         version = "1.0.16";

     

       8
       8
       +
         version = "1.0.17";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf";

     

       12
       12
       -
           hash = "sha256-58gRCEJix9pnZEcoo6bm2zWduP0xXl3WWC6mt36SGuo=";

     

       12
       12
       +
           hash = "sha256-sDMasHVcITTSUP9B87w4I7IZ44tYmabNNWl+kE3dUoE=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         dontUnpack = true;

+3 -3

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "annotated-types";

     

       12
       12
       -
         version = "0.5.0";

     

       12
       12
       +
         version = "0.6.0";

     

       13
       13
        
         format = "pyproject";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "annotated-types";

     

       17
       17
        
           repo = "annotated-types";

     

       18
       18
       -
           rev = "v${version}";

     

       19
       19
       -
           hash = "sha256-zCsWfJ8BQuov8FN+hlm9XBKWAAQ/KHPK/x024A8k2kE=";

     

       18
       18
       +
           rev = "refs/tags/v${version}";

     

       19
       19
       +
           hash = "sha256-SZ9/rXYcns4DFM6vk6SRKvuv3MY3T7xO9aW7WAQqtVE=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [

+3 -3

pkgs/development/python-modules/aws-adfs/default.nix

···

       5
       5
        
       , click

     

       6
       6
        
       , configparser

     

       7
       7
        
       , fetchFromGitHub

     

       8
       8
       -
       , fetchpatch

     

       9
       8
        
       , fido2

     

       10
       9
        
       , lxml

     

       11
       10
        
       , poetry-core

     
···

       20
       19
        
       buildPythonPackage rec {

     

       21
       20
        
         pname = "aws-adfs";

     

       22
       21
        
         version = "2.8.2";

     

       23
       23
       -
         format = "pyproject";

     

       22
       22
       +
         pyproject = true;

     

       24
       23
        
       

     

       25
       25
       -
         disabled = pythonOlder "3.6";

     

       24
       24
       +
         disabled = pythonOlder "3.7";

     

       26
       25
        
       

     

       27
       26
        
         src = fetchFromGitHub {

     

       28
       27
        
           owner = "venth";

     
···

       63
       62
        
         meta = with lib; {

     

       64
       63
        
           description = "Command line tool to ease AWS CLI authentication against ADFS";

     

       65
       64
        
           homepage = "https://github.com/venth/aws-adfs";

     

       65
       65
       +
           changelog = "https://github.com/venth/aws-adfs/releases/tag/v${version}";

     

       66
       66
        
           license = licenses.psfl;

     

       67
       67
        
           maintainers = with maintainers; [ bhipple ];

     

       68
       68
        
         };

+5 -3

pkgs/development/python-modules/crytic-compile/default.nix

···

       6
       6
        
       , pythonOlder

     

       7
       7
        
       , setuptools

     

       8
       8
        
       , solc-select

     

       9
       9
       +
       , toml

     

       9
       10
        
       }:

     

       10
       11
        
       

     

       11
       12
        
       buildPythonPackage rec {

     

       12
       13
        
         pname = "crytic-compile";

     

       13
       13
       -
         version = "0.3.4";

     

       14
       14
       +
         version = "0.3.5";

     

       14
       15
        
         format = "setuptools";

     

       15
       16
        
       

     

       16
       16
       -
         disabled = pythonOlder "3.6";

     

       17
       17
       +
         disabled = pythonOlder "3.8";

     

       17
       18
        
       

     

       18
       19
        
         src = fetchFromGitHub {

     

       19
       20
        
           owner = "crytic";

     

       20
       21
        
           repo = "crytic-compile";

     

       21
       22
        
           rev = "refs/tags/${version}";

     

       22
       22
       -
           hash = "sha256-CeoACtgvMweDbIvYguK2Ca+iTBFONWcE2b0qUkBbQSU=";

     

       23
       23
       +
           hash = "sha256-aO2K0lc3qjKK8CZAbu/lotI5QJ/R+8npSIRX4a6HdrI=";

     

       23
       24
        
         };

     

       24
       25
        
       

     

       25
       26
        
         propagatedBuildInputs = [

     
···

       27
       28
        
           pycryptodome

     

       28
       29
        
           setuptools

     

       29
       30
        
           solc-select

     

       31
       31
       +
           toml

     

       30
       32
        
         ];

     

       31
       33
        
       

     

       32
       34
        
         # Test require network access

+106

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , buildPythonPackage

     

       4
       4
       +
       , pythonOlder

     

       5
       5
       +
       , fetchFromGitHub

     

       6
       6
       +
       , gevent

     

       7
       7
       +
       , pika

     

       8
       8
       +
       , prometheus-client

     

       9
       9
       +
       , pylibmc

     

       10
       10
       +
       , pytestCheckHook

     

       11
       11
       +
       , redis

     

       12
       12
       +
       , watchdog

     

       13
       13
       +
       , watchdog-gevent

     

       14
       14
       +
       }:

     

       15
       15
       +
       

     

       16
       16
       +
       buildPythonPackage rec {

     

       17
       17
       +
         pname = "dramatiq";

     

       18
       18
       +
         version = "1.14.2";

     

       19
       19
       +
         format = "setuptools";

     

       20
       20
       +
       

     

       21
       21
       +
         disabled = pythonOlder "3.7";

     

       22
       22
       +
       

     

       23
       23
       +
         src = fetchFromGitHub {

     

       24
       24
       +
           owner = "Bogdanp";

     

       25
       25
       +
           repo = "dramatiq";

     

       26
       26
       +
           rev = "v${version}";

     

       27
       27
       +
           hash = "sha256-yv6HUJI7wsAQdBJ5QNv7qXhtzPvCsrF1389kyemAV7Y=";

     

       28
       28
       +
         };

     

       29
       29
       +
       

     

       30
       30
       +
         propagatedBuildInputs = [

     

       31
       31
       +
           prometheus-client

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       34
       34
       +
         passthru.optional-dependencies = {

     

       35
       35
       +
           all = [

     

       36
       36
       +
             gevent

     

       37
       37
       +
             pika

     

       38
       38
       +
             pylibmc

     

       39
       39
       +
             redis

     

       40
       40
       +
             watchdog

     

       41
       41
       +
             watchdog-gevent

     

       42
       42
       +
           ];

     

       43
       43
       +
           gevent = [

     

       44
       44
       +
             gevent

     

       45
       45
       +
           ];

     

       46
       46
       +
           memcached = [

     

       47
       47
       +
             pylibmc

     

       48
       48
       +
           ];

     

       49
       49
       +
           rabbitmq = [

     

       50
       50
       +
             pika

     

       51
       51
       +
           ];

     

       52
       52
       +
           redis = [

     

       53
       53
       +
             redis

     

       54
       54
       +
           ];

     

       55
       55
       +
           watch = [

     

       56
       56
       +
             watchdog

     

       57
       57
       +
             watchdog-gevent

     

       58
       58
       +
           ];

     

       59
       59
       +
         };

     

       60
       60
       +
       

     

       61
       61
       +
         nativeCheckInputs = [ pytestCheckHook pika redis pylibmc ];

     

       62
       62
       +
       

     

       63
       63
       +
         postPatch = ''

     

       64
       64
       +
           sed -i ./setup.cfg \

     

       65
       65
       +
             -e 's:--cov dramatiq::' \

     

       66
       66
       +
             -e 's:--cov-report html::' \

     

       67
       67
       +
             -e 's:--benchmark-autosave::' \

     

       68
       68
       +
             -e 's:--benchmark-compare::' \

     

       69
       69
       +
         '';

     

       70
       70
       +
       

     

       71
       71
       +
         disabledTests = [

     

       72
       72
       +
           # Requires a running redis

     

       73
       73
       +
           "test_after_process_boot_call_has_no_blocked_signals"

     

       74
       74
       +
           "test_cli_can_be_reloaded_on_sighup"

     

       75
       75
       +
           "test_cli_can_watch_for_source_code_changes"

     

       76
       76
       +
           "test_cli_fork_functions_have_no_blocked_signals"

     

       77
       77
       +
           "test_consumer_threads_have_no_blocked_signals"

     

       78
       78
       +
           "test_middleware_fork_functions_have_no_blocked_signals"

     

       79
       79
       +
           "test_redis_broker_can_connect_via_client"

     

       80
       80
       +
           "test_redis_broker_can_connect_via_url"

     

       81
       81
       +
           "test_redis_process_100k_messages_with_cli"

     

       82
       82
       +
           "test_redis_process_10k_fib_with_cli"

     

       83
       83
       +
           "test_redis_process_1k_latency_with_cli"

     

       84
       84
       +
           "test_worker_threads_have_no_blocked_signals"

     

       85
       85
       +
           # Requires a running rabbitmq

     

       86
       86
       +
           "test_rabbitmq_broker_can_be_passed_a_list_of_parameters_for_failover"

     

       87
       87
       +
           "test_rabbitmq_broker_can_be_passed_a_list_of_uri_for_failover"

     

       88
       88
       +
           "test_rabbitmq_broker_can_be_passed_a_semicolon_separated_list_of_uris"

     

       89
       89
       +
           "test_rabbitmq_broker_connections_are_lazy"

     

       90
       90
       +
           "test_rabbitmq_process_100k_messages_with_cli"

     

       91
       91
       +
           "test_rabbitmq_process_10k_fib_with_cli"

     

       92
       92
       +
           "test_rabbitmq_process_1k_latency_with_cli"

     

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

     

       94
       94
       +
           # Takes too long for darwin ofborg

     

       95
       95
       +
           "test_retry_exceptions_can_specify_a_delay"

     

       96
       96
       +
         ];

     

       97
       97
       +
       

     

       98
       98
       +
         pythonImportsCheck = [ "dramatiq" ];

     

       99
       99
       +
       

     

       100
       100
       +
         meta = with lib; {

     

       101
       101
       +
           description = "Background Processing for Python 3";

     

       102
       102
       +
           homepage = "https://github.com/Bogdanp/dramatiq";

     

       103
       103
       +
           license = licenses.gpl3Only;

     

       104
       104
       +
           maintainers = with maintainers; [ traxys ];

     

       105
       105
       +
         };

     

       106
       106
       +
       }

+85

pkgs/development/python-modules/flask-dramatiq/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , pythonOlder

     

       4
       4
       +
       , fetchFromGitLab

     

       5
       5
       +
       , poetry-core

     

       6
       6
       +
       , dramatiq

     

       7
       7
       +
       , flask

     

       8
       8
       +
       , requests

     

       9
       9
       +
       , pytestCheckHook

     

       10
       10
       +
       , flask-migrate

     

       11
       11
       +
       , periodiq

     

       12
       12
       +
       , postgresql

     

       13
       13
       +
       , postgresqlTestHook

     

       14
       14
       +
       , psycopg2

     

       15
       15
       +
       }:

     

       16
       16
       +
       

     

       17
       17
       +
       buildPythonPackage {

     

       18
       18
       +
         pname = "flask-dramatiq";

     

       19
       19
       +
         version = "0.6.0";

     

       20
       20
       +
         format = "pyproject";

     

       21
       21
       +
       

     

       22
       22
       +
         disabled = pythonOlder "3.6";

     

       23
       23
       +
       

     

       24
       24
       +
         src = fetchFromGitLab {

     

       25
       25
       +
           owner = "bersace";

     

       26
       26
       +
           repo = "flask-dramatiq";

     

       27
       27
       +
           rev = "840209e9bf582b4dda468e8bba515f248f3f8534";

     

       28
       28
       +
           hash = "sha256-qjV1zyVzHPXMt+oUeGBdP9XVlbcSz2MF9Zygj543T4w=";

     

       29
       29
       +
         };

     

       30
       30
       +
       

     

       31
       31
       +
         postPatch = ''

     

       32
       32
       +
           substituteInPlace pyproject.toml \

     

       33
       33
       +
             --replace 'poetry>=0.12' 'poetry-core' \

     

       34
       34
       +
             --replace 'poetry.masonry.api' 'poetry.core.masonry.api'

     

       35
       35
       +
       

     

       36
       36
       +
           patchShebangs --build ./example.py

     

       37
       37
       +
       

     

       38
       38
       +
           sed -i ./tests/unit/pytest.ini \

     

       39
       39
       +
             -e 's:--cov=flask_dramatiq::' \

     

       40
       40
       +
             -e 's:--cov-report=term-missing::'

     

       41
       41
       +
         '';

     

       42
       42
       +
       

     

       43
       43
       +
         nativeBuildInputs = [

     

       44
       44
       +
           poetry-core

     

       45
       45
       +
         ];

     

       46
       46
       +
       

     

       47
       47
       +
         propagatedBuildInputs = [

     

       48
       48
       +
           dramatiq

     

       49
       49
       +
         ];

     

       50
       50
       +
       

     

       51
       51
       +
         nativeCheckInputs = [

     

       52
       52
       +
           pytestCheckHook

     

       53
       53
       +
           flask

     

       54
       54
       +
           requests

     

       55
       55
       +
           flask-migrate

     

       56
       56
       +
           periodiq

     

       57
       57
       +
           postgresql

     

       58
       58
       +
           postgresqlTestHook

     

       59
       59
       +
           psycopg2

     

       60
       60
       +
         ] ++ dramatiq.optional-dependencies.rabbitmq;

     

       61
       61
       +
       

     

       62
       62
       +
         postgresqlTestSetupPost = ''

     

       63
       63
       +
           substituteInPlace config.py \

     

       64
       64
       +
             --replace 'SQLALCHEMY_DATABASE_URI = f"postgresql://{PGUSER}:{PGPASSWORD}@{PGHOST}/{PGDATABASE}"' \

     

       65
       65
       +
               "SQLALCHEMY_DATABASE_URI = \"postgresql://$PGUSER/$PGDATABASE?host=$PGHOST\""

     

       66
       66
       +
           python3 ./example.py db upgrade

     

       67
       67
       +
         '';

     

       68
       68
       +
       

     

       69
       69
       +
         pytestFlagsArray = [ "-x" "tests/func/" "tests/unit"];

     

       70
       70
       +
       

     

       71
       71
       +
         pythonImportsCheck = [ "flask_dramatiq" ];

     

       72
       72
       +
       

     

       73
       73
       +
         # Does HTTP requests to localhost

     

       74
       74
       +
         disabledTests = [

     

       75
       75
       +
           "test_fast"

     

       76
       76
       +
           "test_other"

     

       77
       77
       +
         ];

     

       78
       78
       +
       

     

       79
       79
       +
         meta = with lib; {

     

       80
       80
       +
           description = "Adds Dramatiq support to your Flask application";

     

       81
       81
       +
           homepage = "https://gitlab.com/bersace/flask-dramatiq";

     

       82
       82
       +
           license = licenses.bsd3;

     

       83
       83
       +
           maintainers = with maintainers; [ traxys ];

     

       84
       84
       +
         };

     

       85
       85
       +
       }

+2 -2

pkgs/development/python-modules/google-cloud-asset/default.nix

···

       18
       18
        
       

     

       19
       19
        
       buildPythonPackage rec {

     

       20
       20
        
         pname = "google-cloud-asset";

     

       21
       21
       -
         version = "3.19.1";

     

       21
       21
       +
         version = "3.20.0";

     

       22
       22
        
         format = "setuptools";

     

       23
       23
        
       

     

       24
       24
        
         disabled = pythonOlder "3.7";

     

       25
       25
        
       

     

       26
       26
        
         src = fetchPypi {

     

       27
       27
        
           inherit pname version;

     

       28
       28
       -
           hash = "sha256-Rmd01HHVOThqSwfnoIrTaMjxqHFuGcKAjwKp3hD4S5o=";

     

       28
       28
       +
           hash = "sha256-lJLC1igiY0OYLu3eyuOvJ2KmFr9n4su8T7LPgWlUtCk=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/google-cloud-automl/default.nix

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "google-cloud-automl";

     

       19
       19
       -
         version = "2.11.2";

     

       19
       19
       +
         version = "2.11.3";

     

       20
       20
        
         format = "setuptools";

     

       21
       21
        
       

     

       22
       22
        
         disabled = pythonOlder "3.7";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchPypi {

     

       25
       25
        
           inherit pname version;

     

       26
       26
       -
           hash = "sha256-w4kzOe8az6zcMLoNYbfkvC5Aq5zCbSNw6+PHYZkEZqI=";

     

       26
       26
       +
           hash = "sha256-VcqQn7w2sTpDHKfniwkwsEXDa8YIV+G1jlbPOu8NVl0=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/logilab/common.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "logilab-common";

     

       15
       15
       -
         version = "1.10.0";

     

       15
       15
       +
         version = "1.11.0";

     

       16
       16
        
         format = "pyproject";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.6";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchPypi {

     

       21
       21
        
           inherit pname version;

     

       22
       22
       -
           hash = "sha256-MoXt3tta5OimJUjOkWSMDCmXV0aS8N0W5bcANwAelYY=";

     

       22
       22
       +
           hash = "sha256-lWl6654nbOBCec24iJ7GGKEcYy/gYDn9wMil3PPqWkk=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [

+55

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , pythonOlder

     

       4
       4
       +
       , fetchFromGitLab

     

       5
       5
       +
       , poetry-core

     

       6
       6
       +
       , dramatiq

     

       7
       7
       +
       , pendulum

     

       8
       8
       +
       , setuptools

     

       9
       9
       +
       , pytest-mock

     

       10
       10
       +
       , pytestCheckHook

     

       11
       11
       +
       }:

     

       12
       12
       +
       

     

       13
       13
       +
       buildPythonPackage rec {

     

       14
       14
       +
         pname = "periodiq";

     

       15
       15
       +
         version = "0.12.1";

     

       16
       16
       +
         format = "pyproject";

     

       17
       17
       +
       

     

       18
       18
       +
         disabled = pythonOlder "3.5";

     

       19
       19
       +
       

     

       20
       20
       +
         src = fetchFromGitLab {

     

       21
       21
       +
           owner = "bersace";

     

       22
       22
       +
           repo = "periodiq";

     

       23
       23
       +
           rev = "v${version}";

     

       24
       24
       +
           hash = "sha256-Ar0n+Wi1OUtRdhVxrU7Nz4je8ylaHgPZbXE0a30hzU0=";

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         postPatch = ''

     

       28
       28
       +
           substituteInPlace pyproject.toml \

     

       29
       29
       +
             --replace 'poetry>=0.12' 'poetry-core' \

     

       30
       30
       +
             --replace 'poetry.masonry.api' 'poetry.core.masonry.api'

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         nativeBuildInputs = [

     

       34
       34
       +
           poetry-core

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       37
       37
       +
         propagatedBuildInputs = [

     

       38
       38
       +
           dramatiq

     

       39
       39
       +
           pendulum

     

       40
       40
       +
           setuptools

     

       41
       41
       +
         ];

     

       42
       42
       +
       

     

       43
       43
       +
         nativeCheckInputs = [ pytestCheckHook pytest-mock ];

     

       44
       44
       +
       

     

       45
       45
       +
         pytestFlagsArray = [ "tests/unit" ];

     

       46
       46
       +
       

     

       47
       47
       +
         pythonImportsCheck = [ "periodiq" ];

     

       48
       48
       +
       

     

       49
       49
       +
         meta = with lib; {

     

       50
       50
       +
           description = "Simple Scheduler for Dramatiq Task Queue";

     

       51
       51
       +
           homepage = "https://pypi.org/project/periodiq/";

     

       52
       52
       +
           license = licenses.lgpl3Only;

     

       53
       53
       +
           maintainers = with maintainers; [ traxys ];

     

       54
       54
       +
         };

     

       55
       55
       +
       }

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "rtree";

     

       13
       13
       -
         version = "1.0.1";

     

       13
       13
       +
         version = "1.1.0";

     

       14
       14
        
         disabled = pythonOlder "3.7";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           pname = "Rtree";

     

       18
       18
        
           inherit version;

     

       19
       19
       -
           hash = "sha256-IiEhaZwwOmQGXYSb9wOLHsq8N7Zcf6NAvts47w6AVCk=";

     

       19
       19
       +
           hash = "sha256-b47lBN3l0AWyWwiq9b4LNASvOtX+zm4d3N41kIp5ipU=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         postPatch = ''

+31

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pillow

     

       5
       5
       +
       , requests

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       buildPythonPackage rec {

     

       9
       9
       +
         pname = "staticmap";

     

       10
       10
       +
         version = "0.5.7";

     

       11
       11
       +
         format = "setuptools";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchPypi {

     

       14
       14
       +
           inherit pname version;

     

       15
       15
       +
           hash = "sha256-x6lrkCumEpLoGMILCBBhnWuBps21C8wauS1QrE2yCn8=";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         propagatedBuildInputs = [ requests pillow ];

     

       19
       19
       +
       

     

       20
       20
       +
         pythonImportsCheck = [ "staticmap" ];

     

       21
       21
       +
       

     

       22
       22
       +
         # Tests seem to be broken

     

       23
       23
       +
         doCheck = false;

     

       24
       24
       +
       

     

       25
       25
       +
         meta = with lib; {

     

       26
       26
       +
           description = "A small, python-based library for creating map images with lines and markers";

     

       27
       27
       +
           homepage = "https://pypi.org/project/staticmap/";

     

       28
       28
       +
           license = with licenses; [ asl20 ];

     

       29
       29
       +
           maintainers = with maintainers; [ traxys ];

     

       30
       30
       +
         };

     

       31
       31
       +
       }

+28

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , setuptools

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       let

     

       8
       8
       +
         pname = "types-click";

     

       9
       9
       +
         version = "7.1.8";

     

       10
       10
       +
       in

     

       11
       11
       +
       buildPythonPackage {

     

       12
       12
       +
         inherit pname version;

     

       13
       13
       +
         format = "pyproject";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchPypi {

     

       16
       16
       +
           inherit pname version;

     

       17
       17
       +
           hash = "sha256-tmBJaL5kAdxRYxHKUHCKCii6p6DLhA79dBLw27/04JI=";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         nativeBuildInputs = [ setuptools ];

     

       21
       21
       +
       

     

       22
       22
       +
         meta = with lib; {

     

       23
       23
       +
           description = "Collection of library stubs for Python, with static types";

     

       24
       24
       +
           homepage = "https://github.com/python/typeshed";

     

       25
       25
       +
           license = licenses.asl20;

     

       26
       26
       +
           maintainers = with maintainers; [ jfvillablanca ];

     

       27
       27
       +
         };

     

       28
       28
       +
       }

+2 -2

pkgs/development/python-modules/universal-pathlib/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "universal-pathlib";

     

       12
       12
       -
         version = "0.1.3";

     

       12
       12
       +
         version = "0.1.4";

     

       13
       13
        
         format = "pyproject";

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.8";

     
···

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           pname = "universal_pathlib";

     

       19
       19
        
           inherit version;

     

       20
       20
       -
           hash = "sha256-GgUqteBRcwHfZr5lF+n+Y82fwAgT5c5xpzcBRBrCtcg=";

     

       20
       20
       +
           hash = "sha256-guXYbRaifg6hrcfYisvLqdAtWkVIgWMXT5bZrCidsuQ=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [

+40

pkgs/development/python-modules/watchdog-gevent/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , gevent

     

       5
       5
       +
       , pytestCheckHook

     

       6
       6
       +
       , watchdog

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         pname = "watchdog-gevent";

     

       11
       11
       +
         version = "0.1.1";

     

       12
       12
       +
         format = "setuptools";

     

       13
       13
       +
       

     

       14
       14
       +
         # Need to fetch from github because tests are not present in pypi

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "Bogdanp";

     

       17
       17
       +
           repo = "watchdog_gevent";

     

       18
       18
       +
           rev = "v${version}";

     

       19
       19
       +
           hash = "sha256-FESm3fNuLmOg2ilI/x8U9LuAimHLnahcTHYzW/nzOVY=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         propagatedBuildInputs = [ watchdog gevent ];

     

       23
       23
       +
       

     

       24
       24
       +
         postPatch = ''

     

       25
       25
       +
           sed -i setup.cfg \

     

       26
       26
       +
             -e 's:--cov watchdog_gevent::' \

     

       27
       27
       +
             -e 's:--cov-report html::'

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         nativeCheckInputs = [ pytestCheckHook ];

     

       31
       31
       +
       

     

       32
       32
       +
         pythonImportsCheck = [ "watchdog_gevent" ];

     

       33
       33
       +
       

     

       34
       34
       +
         meta = with lib; {

     

       35
       35
       +
           description = "A gevent-based observer for watchdog";

     

       36
       36
       +
           homepage = "https://github.com/Bogdanp/watchdog_gevent";

     

       37
       37
       +
           license = licenses.asl20;

     

       38
       38
       +
           maintainers = with maintainers; [ traxys ];

     

       39
       39
       +
         };

     

       40
       40
       +
       }

+2 -2

pkgs/development/tools/continuous-integration/jenkins/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "jenkins";

     

       7
       7
       -
         version = "2.414.2";

     

       7
       7
       +
         version = "2.414.3";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "https://get.jenkins.io/war-stable/${version}/jenkins.war";

     

       11
       11
       -
           hash = "sha256-kiu/Ymn92tYUu2VAJB7QzlUjpKUyginhX157t//VZbg=";

     

       11
       11
       +
           hash = "sha256-LZMlS8GG3zSbxK0GtrHddXxJMZDwVY0RHb2pUXqEe1k=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ makeWrapper ];

+1 -1

pkgs/development/tools/misc/runme/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildGo121Module rec {

     

       14
       14
        
         pname = "runme";

     

       15
       15
       -
         version = "1.7.7";

     

       15
       15
       +
         version = "1.7.8";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "stateful";

+3 -3

pkgs/development/tools/misc/slint-lsp/default.nix

···

       25
       25
        
       in

     

       26
       26
        
       rustPlatform.buildRustPackage rec {

     

       27
       27
        
         pname = "slint-lsp";

     

       28
       28
       -
         version = "1.1.1";

     

       28
       28
       +
         version = "1.2.2";

     

       29
       29
        
       

     

       30
       30
        
         src = fetchCrate {

     

       31
       31
        
           inherit pname version;

     

       32
       32
       -
           sha256 = "sha256-ENv17Az6yzUwD39HDfoD7Bmvs6LHjVp85PaYkTw6jW0=";

     

       32
       32
       +
           sha256 = "sha256-+1nuezax7aV9b+L11zzIouA8QEWduqBzPiT6jvCGMac=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
       -
         cargoHash = "sha256-wL46QhY3Cq2KFLETPRhUWb77o1vNrRA2w1NBAtBc0yo=";

     

       35
       35
       +
         cargoHash = "sha256-o7HDhNtjA0/JybJCiEejR8PcRIdJim+/wq4q8xj9A5Q=";

     

       36
       36
        
       

     

       37
       37
        
         nativeBuildInputs = [ cmake pkg-config fontconfig ];

     

       38
       38
        
         buildInputs = rpathLibs ++ [ xorg.libxcb.dev ]

+7 -3

pkgs/development/tools/mold/default.nix

···

       11
       11
        
       , zstd

     

       12
       12
        
       

     

       13
       13
        
       , buildPackages

     

       14
       14
       +
       , clangStdenv

     

       15
       15
       +
       , gccStdenv

     

       14
       16
        
       , hello

     

       15
       17
        
       , mold

     

       16
       18
        
       , mold-wrapped

     
···

       21
       23
        
       

     

       22
       24
        
       stdenv.mkDerivation rec {

     

       23
       25
        
         pname = "mold";

     

       24
       24
       -
         version = "2.2.0";

     

       26
       26
       +
         version = "2.3.0";

     

       25
       27
        
       

     

       26
       28
        
         src = fetchFromGitHub {

     

       27
       29
        
           owner = "rui314";

     

       28
       30
        
           repo = "mold";

     

       29
       31
        
           rev = "v${version}";

     

       30
       30
       -
           hash = "sha256-ePX80hzzIzSJdGUX96GyxYWcdbXxXyuyNQqj5RDSkKU=";

     

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

     

       31
       33
        
         };

     

       32
       34
        
       

     

       33
       35
        
         nativeBuildInputs = [

     
···

       89
       91
        
             in

     

       90
       92
        
             {

     

       91
       93
        
               version = testers.testVersion { package = mold; };

     

       94
       94
       +
             } // lib.optionalAttrs stdenv.isLinux {

     

       95
       95
       +
               adapter-gcc = helloTest "adapter-gcc" (hello.override (old: { stdenv = useMoldLinker gccStdenv; }));

     

       96
       96
       +
               adapter-llvm = helloTest "adapter-llvm" (hello.override (old: { stdenv = useMoldLinker clangStdenv; }));

     

       92
       97
        
               wrapped = helloTest "wrapped" (hello.overrideAttrs (previousAttrs: {

     

       93
       98
        
                 nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ mold-wrapped ];

     

       94
       99
        
                 NIX_CFLAGS_LINK = toString (previousAttrs.NIX_CFLAGS_LINK or "") + " -fuse-ld=mold";

     

       95
       100
        
               }));

     

       96
       96
       -
               adapter = helloTest "adapter" (hello.override (old: { stdenv = useMoldLinker old.stdenv; }));

     

       97
       101
        
             };

     

       98
       102
        
         };

     

       99
       103

+3 -3

pkgs/development/tools/symfony-cli/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "symfony-cli";

     

       5
       5
       -
         version = "5.5.10";

     

       6
       6
       -
         vendorHash = "sha256-eeVi/O4p7bF4CPqJBCpLfx1Yc5vZZ3b8RV5ERcIL8H4=";

     

       5
       5
       +
         version = "5.6.0";

     

       6
       6
       +
         vendorHash = "sha256-1BqgnWFMk8hWwra75a5o6Rwbj5wiCUIdSnsAcB+7Mno=";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "symfony-cli";

     

       10
       10
        
           repo = "symfony-cli";

     

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

     

       12
       12
       -
           hash = "sha256-n0R+J41lJYxswMnknYAAEKwwIqOremZF73cRBYfD3CE=";

     

       12
       12
       +
           hash = "sha256-AtHRuzpKXp+WlFser0J5MR63rbO0xO4N/L3U0Q3iax8=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         ldflags = [

+4 -4

pkgs/misc/vencord/default.nix

···

       6
       6
        
       , buildWebExtension ? false

     

       7
       7
        
       }:

     

       8
       8
        
       let

     

       9
       9
       -
         version = "1.5.6";

     

       10
       10
       -
         gitHash = "925d709";

     

       9
       9
       +
         version = "1.5.7";

     

       10
       10
       +
         gitHash = "5d7ede3";

     

       11
       11
        
       in

     

       12
       12
        
       buildNpmPackage rec {

     

       13
       13
        
         pname = "vencord";

     
···

       17
       17
        
           owner = "Vendicated";

     

       18
       18
        
           repo = "Vencord";

     

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

     

       20
       20
       -
           hash = "sha256-0vYnhDy7J+JFg6uMtwK+uQsHtxoXi8QskIqyQm1HsqM=";

     

       20
       20
       +
           hash = "sha256-/LrM9lBxuM5+KQJqRlP/lBV+krwZIV2GjMi33N/s+V0=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         ESBUILD_BINARY_PATH = lib.getExe (esbuild.override {

     
···

       37
       37
        
         npmRebuildFlags = [ "|| true" ];

     

       38
       38
        
       

     

       39
       39
        
         makeCacheWritable = true;

     

       40
       40
       -
         npmDepsHash = "sha256-/oMQHIigAY7Jdy6S1lRXjzOnxYrvpzbyvP4z+s+k9Lw=";

     

       40
       40
       +
         npmDepsHash = "sha256-Moy7VlAgl31H8QO+aOVano92C4L/wclHhj+JTnbRM6c=";

     

       41
       41
        
         npmFlags = [ "--legacy-peer-deps" ];

     

       42
       42
        
         npmBuildScript = if buildWebExtension then "buildWeb" else "build";

     

       43
       43
        
         npmBuildFlags = [ "--" "--standalone" "--disable-updater" ];

+2 -2

pkgs/misc/vencord/package-lock.json

···

       1
       1
        
       {

     

       2
       2
        
           "name": "vencord",

     

       3
       3
       -
           "version": "1.5.6",

     

       3
       3
       +
           "version": "1.5.7",

     

       4
       4
        
           "lockfileVersion": 3,

     

       5
       5
        
           "requires": true,

     

       6
       6
        
           "packages": {

     

       7
       7
        
               "": {

     

       8
       8
        
                   "name": "vencord",

     

       9
       9
       -
                   "version": "1.5.6",

     

       9
       9
       +
                   "version": "1.5.7",

     

       10
       10
        
                   "license": "GPL-3.0-or-later",

     

       11
       11
        
                   "dependencies": {

     

       12
       12
        
                       "@sapphi-red/web-noise-suppressor": "0.3.3",

+1 -1

pkgs/os-specific/linux/minimal-bootstrap/coreutils/default.nix

···

       6
       6
        
       , gnupatch

     

       7
       7
        
       }:

     

       8
       8
        
       let

     

       9
       9
       -
         pname = "coreutils";

     

       9
       9
       +
         pname = "bootstrap-coreutils";

     

       10
       10
        
         version = "5.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchurl {

+1 -1

pkgs/os-specific/linux/minimal-bootstrap/coreutils/musl.nix

···

       12
       12
        
       , gzip

     

       13
       13
        
       }:

     

       14
       14
        
       let

     

       15
       15
       -
         pname = "coreutils";

     

       15
       15
       +
         pname = "bootstrap-coreutils-musl";

     

       16
       16
        
         version = "9.4";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchurl {

+105

pkgs/servers/geospatial/fit-trackee/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , python3

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , fetchPypi

     

       5
       5
       +
       , postgresql

     

       6
       6
       +
       , postgresqlTestHook

     

       7
       7
       +
       }:

     

       8
       8
       +
       let

     

       9
       9
       +
         python = python3.override {

     

       10
       10
       +
           packageOverrides = self: super: {

     

       11
       11
       +
             sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {

     

       12
       12
       +
               version = "1.4.49";

     

       13
       13
       +
               src = fetchPypi {

     

       14
       14
       +
                 pname = "SQLAlchemy";

     

       15
       15
       +
                 inherit version;

     

       16
       16
       +
                 hash = "sha256-Bv8ly64ww5bEt3N0ZPKn/Deme32kCZk7GCsCTOyArtk=";

     

       17
       17
       +
               };

     

       18
       18
       +
               # Remove "test/typing" that does not exist

     

       19
       19
       +
               disabledTestPaths = [

     

       20
       20
       +
                 "test/aaa_profiling"

     

       21
       21
       +
                 "test/ext/mypy"

     

       22
       22
       +
               ];

     

       23
       23
       +
             });

     

       24
       24
       +
           };

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
       in

     

       28
       28
       +
       python.pkgs.buildPythonApplication rec {

     

       29
       29
       +
         pname = "fit-trackee";

     

       30
       30
       +
         version = "0.7.22";

     

       31
       31
       +
         format = "pyproject";

     

       32
       32
       +
       

     

       33
       33
       +
         src = fetchFromGitHub {

     

       34
       34
       +
           owner = "SamR1";

     

       35
       35
       +
           repo = "FitTrackee";

     

       36
       36
       +
           rev = "v${version}";

     

       37
       37
       +
           hash = "sha256-aPQ8jLssN9nx0Bpd/44E3sQi2w0cR8ecG76DJjreeHA=";

     

       38
       38
       +
         };

     

       39
       39
       +
       

     

       40
       40
       +
         postPatch = ''

     

       41
       41
       +
           substituteInPlace pyproject.toml \

     

       42
       42
       +
             --replace psycopg2-binary psycopg2 \

     

       43
       43
       +
             --replace 'poetry>=0.12' 'poetry-core' \

     

       44
       44
       +
             --replace 'poetry.masonry.api' 'poetry.core.masonry.api'

     

       45
       45
       +
         '';

     

       46
       46
       +
       

     

       47
       47
       +
         nativeBuildInputs = [

     

       48
       48
       +
           python3.pkgs.poetry-core

     

       49
       49
       +
         ];

     

       50
       50
       +
       

     

       51
       51
       +
         propagatedBuildInputs = with python.pkgs; [

     

       52
       52
       +
           authlib

     

       53
       53
       +
           babel

     

       54
       54
       +
           dramatiq

     

       55
       55
       +
           flask

     

       56
       56
       +
           flask-bcrypt

     

       57
       57
       +
           flask-dramatiq

     

       58
       58
       +
           flask-limiter

     

       59
       59
       +
           flask-migrate

     

       60
       60
       +
           gpxpy

     

       61
       61
       +
           gunicorn

     

       62
       62
       +
           humanize

     

       63
       63
       +
           psycopg2

     

       64
       64
       +
           pyjwt

     

       65
       65
       +
           pyopenssl

     

       66
       66
       +
           pytz

     

       67
       67
       +
           shortuuid

     

       68
       68
       +
           sqlalchemy

     

       69
       69
       +
           staticmap

     

       70
       70
       +
           ua-parser

     

       71
       71
       +
         ] ++ dramatiq.optional-dependencies.redis;

     

       72
       72
       +
       

     

       73
       73
       +
         pythonImportsCheck = [ "fittrackee" ];

     

       74
       74
       +
       

     

       75
       75
       +
         nativeCheckInputs = with python.pkgs; [

     

       76
       76
       +
           pytestCheckHook

     

       77
       77
       +
           freezegun

     

       78
       78
       +
           postgresqlTestHook

     

       79
       79
       +
           postgresql

     

       80
       80
       +
         ];

     

       81
       81
       +
       

     

       82
       82
       +
         pytestFlagsArray = [

     

       83
       83
       +
           "fittrackee"

     

       84
       84
       +
         ];

     

       85
       85
       +
       

     

       86
       86
       +
         postgresqlTestSetupPost = ''

     

       87
       87
       +
           export DATABASE_TEST_URL=postgresql://$PGUSER/$PGDATABAS?host=$PGHOST

     

       88
       88
       +
         '';

     

       89
       89
       +
       

     

       90
       90
       +
         postInstall = ''

     

       91
       91
       +
           mkdir -p $out/var/share/fittrackee-instance

     

       92
       92
       +
         '';

     

       93
       93
       +
       

     

       94
       94
       +
         preCheck = ''

     

       95
       95
       +
           export TMP=$(mktemp -d)

     

       96
       96
       +
         '';

     

       97
       97
       +
       

     

       98
       98
       +
         meta = with lib; {

     

       99
       99
       +
           description = "Self-hosted outdoor activity tracker :bicyclist";

     

       100
       100
       +
           homepage = "https://github.com/SamR1/FitTrackee";

     

       101
       101
       +
           changelog = "https://github.com/SamR1/FitTrackee/blob/${src.rev}/CHANGELOG.md";

     

       102
       102
       +
           license = licenses.agpl3Only;

     

       103
       103
       +
           maintainers = with maintainers; [ traxys ];

     

       104
       104
       +
         };

     

       105
       105
       +
       }

+5 -3

pkgs/servers/monitoring/plugins/default.nix

···

       21
       21
        
       , openldap

     

       22
       22
        
       , procps

     

       23
       23
        
       , runtimeShell

     

       24
       24
       +
       , unixtools

     

       24
       25
        
       }:

     

       25
       26
        
       

     

       26
       27
        
       let

     
···

       33
       34
        
           lm_sensors

     

       34
       35
        
           net-snmp

     

       35
       36
        
           procps

     

       37
       37
       +
           unixtools.ping

     

       36
       38
        
         ];

     

       37
       39
        
       

     

       38
       40
        
         mailq = runCommand "mailq-wrapper" { preferLocalBuild = true; } ''

     
···

       58
       60
        
           sha256 = "sha256-yLhHOSrPFRjW701aOL8LPe4OnuJxL6f+dTxNqm0evIg=";

     

       59
       61
        
         };

     

       60
       62
        
       

     

       61
       61
       -
         # TODO: Awful hack. Grrr... this of course only works on NixOS.

     

       63
       63
       +
         # TODO: Awful hack. Grrr...

     

       62
       64
        
         # Anyway the check that configure performs to figure out the ping

     

       63
       65
        
         # syntax is totally impure, because it runs an actual ping to

     

       64
       66
        
         # localhost (which won't work for ping6 if IPv6 support isn't

     
···

       74
       76
        
             -e 's|^DEFAULT_PATH=.*|DEFAULT_PATH=\"${binPath}\"|'

     

       75
       77
        
       

     

       76
       78
        
           configureFlagsArray+=(

     

       77
       77
       -
             --with-ping-command='/run/wrappers/bin/ping -4 -n -U -w %d -c %d %s'

     

       78
       78
       -
             --with-ping6-command='/run/wrappers/bin/ping -6 -n -U -w %d -c %d %s'

     

       79
       79
       +
             --with-ping-command='ping -4 -n -U -w %d -c %d %s'

     

       80
       80
       +
             --with-ping6-command='ping -6 -n -U -w %d -c %d %s'

     

       79
       81
        
           )

     

       80
       82
        
       

     

       81
       83
        
           install -Dm555 ${share} $out/share

+2 -2

pkgs/servers/snac2/default.nix

···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
        
         pname = "snac2";

     

       13
       13
       -
         version = "2.41";

     

       13
       13
       +
         version = "2.42";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitea {

     

       16
       16
        
           domain = "codeberg.org";

     

       17
       17
        
           owner = "grunfink";

     

       18
       18
        
           repo = pname;

     

       19
       19
        
           rev = version;

     

       20
       20
       -
           hash = "sha256-WVbGORth3paDo1eK/J7MPUstVQifcU7ksVEb87vknN0=";

     

       20
       20
       +
           hash = "sha256-cLSbmEZj5lyMtZMM2vaWqdrXFk1/VPws9yBPhSUka2E=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         buildInputs = [ curl openssl ];

+1 -1

pkgs/shells/fish/default.nix

···

       79
       79
        
           # note that this is required:

     

       80
       80
        
           #   1. For all shells, not just login shells (mosh needs this as do some other command-line utilities)

     

       81
       81
        
           #   2. Before the shell is initialized, so that config snippets can find the commands they use on the PATH

     

       82
       82
       -
           builtin status --is-login

     

       82
       82
       +
           builtin status is-login

     

       83
       83
        
           or test -z "$__fish_nixos_env_preinit_sourced" -a -z "$ETC_PROFILE_SOURCED" -a -z "$ETC_ZSHENV_SOURCED"

     

       84
       84
        
           ${if fishEnvPreInit != null then ''

     

       85
       85
        
           and begin

+2 -2

pkgs/shells/fish/plugins/tide.nix

···

       4
       4
        
       # Refer to the following comment to get you setup: https://github.com/NixOS/nixpkgs/pull/201646#issuecomment-1320893716

     

       5
       5
        
       buildFishPlugin rec {

     

       6
       6
        
         pname = "tide";

     

       7
       7
       -
         version = "5.6.0";

     

       7
       7
       +
         version = "6.0.1";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "IlanCosman";

     

       11
       11
        
           repo = "tide";

     

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

     

       13
       13
       -
           hash = "sha256-cCI1FDpvajt1vVPUd/WvsjX/6BJm6X1yFPjqohmo1rI=";

     

       13
       13
       +
           hash = "sha256-oLD7gYFCIeIzBeAW1j62z5FnzWAp3xSfxxe7kBtTLgA=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         #buildFishplugin will only move the .fish files, but tide has a tide configure function

+1 -1

pkgs/shells/fish/wrapper.nix

···

       18
       18
        
           name = "wrapfish.aliases.fish";

     

       19
       19
        
           destination = "/share/fish/vendor_conf.d/aliases.fish";

     

       20
       20
        
           text = ''

     

       21
       21
       -
             status --is-interactive; and begin

     

       21
       21
       +
             status is-interactive; and begin

     

       22
       22
        
               # Aliases

     

       23
       23
        
               ${aliasesStr}

     

       24
       24
        
             end

+4 -10

pkgs/stdenv/adapters.nix

···

       197
       197
        
             '';

     

       198
       198
        
           };

     

       199
       199
        
         in stdenv.override (old: {

     

       200
       200
       -
           cc = stdenv.cc.override {

     

       201
       201
       -
             inherit bintools;

     

       202
       202
       -
           };

     

       203
       203
       -
           allowedRequisites =

     

       204
       204
       -
             (lib.optional (stdenv.allowedRequisites or null != null) stdenv.allowedRequisites)

     

       205
       205
       -
               ++ [ bintools pkgs.mold ]

     

       206
       206
       -
               # need to `outputSpecified = false` to make getLib work

     

       207
       207
       -
               ++ (builtins.map (p: lib.getLib (p // { outputSpecified = false; })) pkgs.mold.buildInputs);

     

       208
       208
       -
             # gcc >12.1.0 supports '-fuse-ld=mold'

     

       209
       209
       -
             # the wrap ld above in bintools supports gcc <12.1.0 and shouldn't harm >12.1.0

     

       200
       200
       +
           allowedRequisites = null;

     

       201
       201
       +
           cc = stdenv.cc.override { inherit bintools; };

     

       202
       202
       +
           # gcc >12.1.0 supports '-fuse-ld=mold'

     

       203
       203
       +
           # the wrap ld above in bintools supports gcc <12.1.0 and shouldn't harm >12.1.0

     

       210
       204
        
           # https://github.com/rui314/mold#how-to-use

     

       211
       205
        
           } // lib.optionalAttrs (stdenv.cc.isClang || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12")) {

     

       212
       206
        
           mkDerivationFromStdenv = extendMkDerivationArgs old (args: {

+2 -2

pkgs/tools/audio/openai-whisper-cpp/default.nix

···

       12
       12
        
       

     

       13
       13
        
       stdenv.mkDerivation rec {

     

       14
       14
        
         pname = "whisper-cpp";

     

       15
       15
       -
         version = "1.4.0";

     

       15
       15
       +
         version = "1.4.2";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "ggerganov";

     

       19
       19
        
           repo = "whisper.cpp";

     

       20
       20
        
           rev = "refs/tags/v${version}" ;

     

       21
       21
       -
           hash = "sha256-176MpooVQrq1dXC62h8Yyyhw6IjCA50tp1J4DQPSePQ=";

     

       21
       21
       +
           hash = "sha256-Qea9zGLJ41D+l8h1Sg/KJI6Ou02jtbRIxYPGoabM8nY=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         # The upstream download script tries to download the models to the

+2 -2

pkgs/tools/misc/dooit/default.nix

···

       7
       7
        
       

     

       8
       8
        
       python3.pkgs.buildPythonApplication rec {

     

       9
       9
        
         pname = "dooit";

     

       10
       10
       -
         version = "2.0.1";

     

       10
       10
       +
         version = "2.1.0";

     

       11
       11
        
         format = "pyproject";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "kraanzu";

     

       15
       15
        
           repo = "dooit";

     

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

     

       17
       17
       -
           hash = "sha256-iQAGD6zrBBd4fJONaB7to1OJpAJUO0zeA1xhVQZBkMc=";

     

       17
       17
       +
           hash = "sha256-ZCEBpaQHaFb09MUlN6acYB3LrfX456uRbhVh9YPz7NU=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = with python3.pkgs; [

+17 -1

pkgs/tools/networking/xrootd/default.nix

···

       4
       4
        
       , fetchFromGitHub

     

       5
       5
        
       , cmake

     

       6
       6
        
       , cppunit

     

       7
       7
       +
       , makeWrapper

     

       7
       8
        
       , pkg-config

     

       8
       9
        
       , curl

     

       9
       10
        
       , fuse

     
···

       24
       25
        
       }:

     

       25
       26
        
       

     

       26
       27
        
       stdenv.mkDerivation (finalAttrs: {

     

       28
       28
       +
       

     

       29
       29
       +
         __structuredAttrs = true;

     

       30
       30
       +
       

     

       27
       31
        
         pname = "xrootd";

     

       28
       32
        
         version = "5.5.5";

     

       29
       33
        
       

     
···

       55
       59
        
       

     

       56
       60
        
         nativeBuildInputs = [

     

       57
       61
        
           cmake

     

       62
       62
       +
           makeWrapper

     

       58
       63
        
           pkg-config

     

       59
       64
        
         ];

     

       60
       65
        
       

     
···

       101
       106
        
           "-DENABLE_TESTS=TRUE"

     

       102
       107
        
         ];

     

       103
       108
        
       

     

       104
       104
       -
         postFixup = lib.optionalString (externalEtc != null) ''

     

       109
       109
       +
         makeWrapperArgs = [

     

       110
       110
       +
           # Workaround the library-not-found issue

     

       111
       111
       +
           # happening to binaries compiled with xrootd libraries.

     

       112
       112
       +
           # See #169677

     

       113
       113
       +
           "--prefix" "${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH" ":" "${placeholder "out"}/lib"

     

       114
       114
       +
         ];

     

       115
       115
       +
       

     

       116
       116
       +
         postFixup = ''

     

       117
       117
       +
           while IFS= read -r FILE; do

     

       118
       118
       +
             wrapProgram "$FILE" "''${makeWrapperArgs[@]}"

     

       119
       119
       +
           done < <(find "$bin/bin" -mindepth 1 -maxdepth 1 -type f,l -perm -a+x)

     

       120
       120
       +
         '' + lib.optionalString (externalEtc != null) ''

     

       105
       121
        
           mv "$out"/etc{,.orig}

     

       106
       122
        
           ln -s ${lib.escapeShellArg externalEtc} "$out/etc"

     

       107
       123
        
         '';

+1 -3

pkgs/tools/networking/xrootd/fetchxrd.nix

···

       21
       21
        
           inherit url;

     

       22
       22
        
           urls = if urls == [ ] then lib.singleton url else urls;

     

       23
       23
        
         }

     

       24
       24
       -
         # Set [DY]LD_LIBRARY_PATH to workaround #169677

     

       25
       25
       -
         # TODO: Remove the library path after #200830 get merged

     

       26
       24
        
         ''

     

       27
       25
        
           for u in $urls; do

     

       28
       28
       -
             ${lib.optionalString buildPlatform.isDarwin "DY"}LD_LIBRARY_PATH=${lib.makeLibraryPath [ xrootd ]} xrdcp --force "$u" "$out"

     

       26
       26
       +
             xrdcp --verbose --force "$u" "$out"

     

       29
       27
        
             ret=$?

     

       30
       28
        
             (( ret != 0 )) || break

     

       31
       29
        
           done

+14 -9

pkgs/tools/security/aws-iam-authenticator/default.nix

···

       1
       1
       -
       { lib, buildGoModule, fetchFromGitHub }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildGoModule

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       }:

     

       2
       5
        
       

     

       3
       6
        
       buildGoModule rec {

     

       4
       7
        
         pname = "aws-iam-authenticator";

     

       5
       5
       -
         version = "0.6.11";

     

       8
       8
       +
         version = "0.6.12";

     

       6
       9
        
       

     

       7
       10
        
         src = fetchFromGitHub {

     

       8
       11
        
           owner = "kubernetes-sigs";

     

       9
       12
        
           repo = pname;

     

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

     

       11
       11
       -
           hash = "sha256-4bZnGgf/H2/uLhh8ip8rrA+U0vA+1SO5uhjLK40j3wE=";

     

       13
       13
       +
           rev = "refs/tags/v${version}";

     

       14
       14
       +
           hash = "sha256-IIlAsxxEYjR7+wdWExdsQAH0x4yOXZ+bVQWwn7mrhRw=";

     

       12
       15
        
         };

     

       13
       16
        
       

     

       14
       17
        
         vendorHash = "sha256-RcZqnyZtonE4qeu+llL1OPGPG93/Rx8ESWM5wapZ1BM=";

     

       15
       18
        
       

     

       16
       19
        
         ldflags = let PKG = "sigs.k8s.io/aws-iam-authenticator"; in [

     

       17
       17
       -
           "-s" "-w"

     

       18
       18
       -
           "-X ${PKG}/pkg.Version=${version}"

     

       19
       19
       -
           "-X ${PKG}/pkg.BuildDate=1970-01-01T01:01:01Z"

     

       20
       20
       -
           "-X ${PKG}/pkg.CommitID=${version}"

     

       20
       20
       +
           "-s"

     

       21
       21
       +
           "-w"

     

       22
       22
       +
           "-X=${PKG}/pkg.Version=${version}"

     

       23
       23
       +
           "-X=${PKG}/pkg.BuildDate=1970-01-01T01:01:01Z"

     

       24
       24
       +
           "-X ?${PKG}/pkg.CommitID=${version}"

     

       21
       25
        
         ];

     

       22
       26
        
       

     

       23
       27
        
         subPackages = [ "cmd/aws-iam-authenticator" ];

     
···

       25
       29
        
         meta = with lib; {

     

       26
       30
        
           homepage = "https://github.com/kubernetes-sigs/aws-iam-authenticator";

     

       27
       31
        
           description = "AWS IAM credentials for Kubernetes authentication";

     

       32
       32
       +
           changelog = "https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/tag/v${version}";

     

       28
       33
        
           license = licenses.asl20;

     

       29
       29
       -
           maintainers = [ maintainers.srhb ];

     

       34
       34
       +
           maintainers = with maintainers; [ srhb ];

     

       30
       35
        
         };

     

       31
       36
        
       }

+18 -8

pkgs/tools/security/evil-winrm/default.nix

···

       1
       1
       -
       { stdenv, lib, fetchFromGitHub, makeWrapper, bundlerEnv }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , makeWrapper

     

       5
       5
       +
       , bundlerEnv

     

       6
       6
       +
       }:

     

       2
       7
        
       

     

       3
       8
        
       stdenv.mkDerivation rec {

     

       4
       9
        
         pname = "evil-winrm";

     

       5
       5
       -
         version = "3.3";

     

       10
       10
       +
         version = "3.5";

     

       6
       11
        
       

     

       7
       12
        
         src = fetchFromGitHub {

     

       8
       13
        
           owner = "Hackplayers";

     

       9
       14
        
           repo = "evil-winrm";

     

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

     

       11
       11
       -
           sha256 = "sha256-uWhRkq7I/XRWSUpR8lWRhDImE6x0pX9/B3gKhRIhkf8=";

     

       15
       15
       +
           rev = "refs/tags/v${version}";

     

       16
       16
       +
           hash = "sha256-8Lyo7BgypzrHMEcbYlxo/XWwOtBqs2tczYnc3+XEbeA=";

     

       12
       17
        
         };

     

       13
       18
        
       

     

       14
       19
        
         env = bundlerEnv {

     
···

       18
       23
        
           gemset = ./gemset.nix;

     

       19
       24
        
         };

     

       20
       25
        
       

     

       21
       21
       -
         nativeBuildInputs = [ makeWrapper ];

     

       22
       22
       -
         buildInputs = [ env.wrappedRuby ];

     

       26
       26
       +
         nativeBuildInputs = [

     

       27
       27
       +
           makeWrapper

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         buildInputs = [

     

       31
       31
       +
           env.wrappedRuby

     

       32
       32
       +
         ];

     

       23
       33
        
       

     

       24
       34
        
         installPhase = ''

     

       25
       35
        
           mkdir -p $out/bin

     
···

       27
       37
        
         '';

     

       28
       38
        
       

     

       29
       39
        
         meta = with lib; {

     

       30
       30
       -
           homepage = "https://github.com/Hackplayers/evil-winrm";

     

       31
       31
       -
           changelog = "https://github.com/Hackplayers/evil-winrm/releases/tag/v${version}";

     

       32
       40
        
           description = "WinRM shell for hacking/pentesting";

     

       41
       41
       +
           homepage = "https://github.com/Hackplayers/evil-winrm";

     

       42
       42
       +
           changelog = "https://github.com/Hackplayers/evil-winrm/blob/v${version}/CHANGELOG.md";

     

       33
       43
        
           license = licenses.lgpl3Plus;

     

       34
       44
        
           maintainers = with maintainers; [ elohmeier ];

     

       35
       45
        
         };

+6 -1

pkgs/tools/security/fail2ban/default.nix

···

       43
       43
        
           substituteInPlace setup.py --replace /usr/share/doc/ share/doc/

     

       44
       44
        
       

     

       45
       45
        
           # see https://github.com/NixOS/nixpkgs/issues/4968

     

       46
       46
       -
           ${python3.interpreter} setup.py install_data --install-dir=$out --root=$out

     

       46
       46
       +
           ${python3.pythonForBuild.interpreter} setup.py install_data --install-dir=$out --root=$out

     

       47
       47
        
         '';

     

       48
       48
        
       

     

       49
       49
        
         postInstall =

     
···

       61
       61
        
             rm -r "${sitePackages}/etc"

     

       62
       62
        
       

     

       63
       63
        
             installManPage man/*.[1-9]

     

       64
       64
       +
       

     

       65
       65
       +
             # This is a symlink to the build python version created by `updatePyExec`, seemingly to assure the same python version is used?

     

       66
       66
       +
             rm $out/bin/fail2ban-python

     

       67
       67
       +
             ln -s ${python3.interpreter} $out/bin/fail2ban-python

     

       68
       68
       +
       

     

       64
       69
        
           '' + lib.optionalString stdenv.isLinux ''

     

       65
       70
        
             # see https://github.com/NixOS/nixpkgs/issues/4968

     

       66
       71
        
             rm -r "${sitePackages}/usr"

+3 -3

pkgs/tools/security/sshocker/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "sshocker";

     

       8
       8
       -
         version = "0.3.3";

     

       8
       8
       +
         version = "0.3.4";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "lima-vm";

     

       12
       12
        
           repo = "sshocker";

     

       13
       13
        
           rev = "refs/tags/v${version}";

     

       14
       14
       -
           hash = "sha256-Z1Dg+AeyfFmUDc3jV8/tOcUrxuyInfwubzo0cLpfFl8=";

     

       14
       14
       +
           hash = "sha256-IDbGRQSLQlT4lt2bextGYB4fJfbpLhPx3JF1eYDJ6gw=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         vendorHash = "sha256-ceQzYByJNXr02IDBKhYuqnKfaTbnX5T03p2US4HRu6I=";

     

       17
       17
       +
         vendorHash = "sha256-kee5D80RjCVosts/Jd6WuvtiK/J5+79HsM5ITHs15xc=";

     

       18
       18
        
       

     

       19
       19
        
         ldflags = [

     

       20
       20
        
           "-s"

+3 -3

pkgs/tools/text/ov/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildGoModule rec {

     

       12
       12
        
         pname = "ov";

     

       13
       13
       -
         version = "0.32.0";

     

       13
       13
       +
         version = "0.32.1";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "noborus";

     

       17
       17
        
           repo = "ov";

     

       18
       18
        
           rev = "refs/tags/v${version}";

     

       19
       19
       -
           hash = "sha256-mQ1KwElD8RizOT2trHWo4T1QiZ974xwhQCCa5snpnZM=";

     

       19
       19
       +
           hash = "sha256-S84CMC02KJ5eevLxVkapCdjZh4PH95u/0AK4tpkOx2k=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         vendorHash = "sha256-XACdtJdACMKQ5gSJcjGAPNGPFL1Tbt6QOovl15mvFGI=";

     

       22
       22
       +
         vendorHash = "sha256-1NdvUdPPr0Twx0hyve4/vvDR2cU+mGyws3UIf8jHfbw=";

     

       23
       23
        
       

     

       24
       24
        
         ldflags = [

     

       25
       25
        
           "-s"

+3 -3

pkgs/tools/text/rsbkb/default.nix

···

       6
       6
        
       

     

       7
       7
        
       rustPlatform.buildRustPackage rec {

     

       8
       8
        
         pname = "rsbkb";

     

       9
       9
       -
         version = "1.2";

     

       9
       9
       +
         version = "1.2.1";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "trou";

     

       13
       13
        
           repo = "rsbkb";

     

       14
       14
        
           rev = "release-${version}";

     

       15
       15
       -
           hash = "sha256-Y6YTjEbefNUPcl6rNYWVZLGZYTUPr5pvfLabS+zDWqA=";

     

       15
       15
       +
           hash = "sha256-+plf7BoYpEFPRsGKNrvLF8TAU3Z7nyx6Td6uRBoNGiE=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         cargoHash = "sha256-RMX+ZdPaqtqRJvhHFJJrPZnBGwQwZSCXNg1oNo+v2+8=";

     

       18
       18
       +
         cargoHash = "sha256-HyosR/5tZCRU2CNnnGITEuESW30Zq3s33UFNcLmEWIA=";

     

       19
       19
        
       

     

       20
       20
        
         # Setup symlinks for all the utilities,

     

       21
       21
        
         # busybox style

+2 -2

pkgs/tools/typesetting/sile/default.nix

···

       46
       46
        
       

     

       47
       47
        
       stdenv.mkDerivation (finalAttrs: {

     

       48
       48
        
         pname = "sile";

     

       49
       49
       -
         version = "0.14.11";

     

       49
       49
       +
         version = "0.14.12";

     

       50
       50
        
       

     

       51
       51
        
         src = fetchurl {

     

       52
       52
        
           url = "https://github.com/sile-typesetter/sile/releases/download/v${finalAttrs.version}/sile-${finalAttrs.version}.tar.xz";

     

       53
       53
       -
           sha256 = "sha256-JXlgiK1XyZZSe5QXz06zwEAnVYhiIZhhIaBmfxAgRS4=";

     

       53
       53
       +
           sha256 = "sha256-iyxNi4Y2zaeR6HUf/IVW1M7mB0WhM2yxOqDkb1oAkHg=";

     

       54
       54
        
         };

     

       55
       55
        
       

     

       56
       56
        
         configureFlags = [

+7 -2

pkgs/top-level/all-packages.nix

···

       2112
       2112
        
       

     

       2113
       2113
        
         xpaste = callPackage ../tools/text/xpaste { };

     

       2114
       2114
        
       

     

       2115
       2115
       -
         xrootd = callPackage ../tools/networking/xrootd { };

     

       2115
       2115
       +
         xrootd = callPackage ../tools/networking/xrootd {

     

       2116
       2116
       +
           # Workaround systemd static build breakage

     

       2117
       2117
       +
           systemd = if systemd.meta.broken then null else systemd;

     

       2118
       2118
       +
         };

     

       2116
       2119
        
       

     

       2117
       2120
        
         yabridge = callPackage ../tools/audio/yabridge {

     

       2118
       2121
        
           wine = wineWowPackages.staging;

     
···

       27557
       27560
        
       

     

       27558
       27561
        
         ### SERVERS / GEOSPATIAL

     

       27559
       27562
        
       

     

       27563
       27563
       +
         fit-trackee = callPackage ../servers/geospatial/fit-trackee { };

     

       27564
       27564
       +
       

     

       27560
       27565
        
         geoserver = callPackage ../servers/geospatial/geoserver { };

     

       27561
       27566
        
       

     

       27562
       27567
        
         mapcache = callPackage ../servers/geospatial/mapcache { };

     
···

       36489
       36494
        
       

     

       36490
       36495
        
         windowlab = callPackage ../applications/window-managers/windowlab { };

     

       36491
       36496
        
       

     

       36492
       36492
       -
         dockapps = callPackage ../by-name/wi/windowmaker/dockapps { };

     

       36497
       36497
       +
         inherit (windowmaker) dockapps;

     

       36493
       36498
        
       

     

       36494
       36499
        
         wily = callPackage ../applications/editors/wily { };

     

       36495
       36500

+48 -15

pkgs/top-level/perl-packages.nix

···

       4758
       4758
        
           };

     

       4759
       4759
        
         };

     

       4760
       4760
        
       

     

       4761
       4761
       +
         CryptBcrypt = buildPerlPackage {

     

       4762
       4762
       +
           pname = "Crypt-Bcrypt";

     

       4763
       4763
       +
           version = "0.011";

     

       4764
       4764
       +
           src = fetchurl {

     

       4765
       4765
       +
             url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Bcrypt-0.011.tar.gz";

     

       4766
       4766
       +
             hash = "sha256-Z/ymiwUm5zTi2VvGsyutAcMZ5Yer9j5M80Itpmu+o6A=";

     

       4767
       4767
       +
           };

     

       4768
       4768
       +
           meta = {

     

       4769
       4769
       +
             description = "modern bcrypt implementation";

     

       4770
       4770
       +
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     

       4771
       4771
       +
           };

     

       4772
       4772
       +
         };

     

       4773
       4773
       +
       

     

       4761
       4774
        
         CryptBlowfish = buildPerlPackage {

     

       4762
       4775
        
           pname = "Crypt-Blowfish";

     

       4763
       4776
        
           version = "2.14";

     
···

       4932
       4945
        
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     

       4933
       4946
        
             maintainers = [ maintainers.sgo ];

     

       4934
       4947
        
           };

     

       4948
       4948
       +
         };

     

       4949
       4949
       +
       

     

       4950
       4950
       +
         CryptHSXKPasswd = buildPerlPackage {

     

       4951
       4951
       +
           pname = "Crypt-HSXKPasswd";

     

       4952
       4952
       +
           version = "3.6";

     

       4953
       4953
       +
           src = fetchurl {

     

       4954
       4954
       +
             url = "mirror://cpan/authors/id/B/BA/BARTB/Crypt-HSXKPasswd-v3.6.tar.gz";

     

       4955
       4955
       +
             hash = "sha256-lZ3MX58BG/ALha0i31ZrerK/XqHTYrDeD7WuKfvEWLM=";

     

       4956
       4956
       +
           };

     

       4957
       4957
       +
           buildInputs = [ Clone DateTime FileHomeDir FileShare FileShareDir GetoptLong JSON ListMoreUtils MathRound Readonly TextUnidecode TypeTiny ];

     

       4958
       4958
       +
           meta = {

     

       4959
       4959
       +
             description = "A secure memorable password generator";

     

       4960
       4960
       +
             homepage = "http://www.bartb.ie/hsxkpasswd";

     

       4961
       4961
       +
             license = with lib.licenses; [ bsd2 ];

     

       4962
       4962
       +
             maintainers = [ maintainers.dannixon ];

     

       4963
       4963
       +
             mainProgram = "hsxkpasswd";

     

       4964
       4964
       +
           };

     

       4965
       4965
       +
           # Two tests fail as a result of https://github.com/bbusschots/hsxkpasswd/issues/42

     

       4966
       4966
       +
           # (also see https://github.com/bbusschots/hsxkpasswd/issues/43)

     

       4967
       4967
       +
           doCheck = false;

     

       4935
       4968
        
         };

     

       4936
       4969
        
       

     

       4937
       4970
        
         CryptIDEA = buildPerlPackage {

     
···

       9715
       9748
        
       

     

       9716
       9749
        
         FileReadBackwards = buildPerlPackage {

     

       9717
       9750
        
           pname = "File-ReadBackwards";

     

       9718
       9718
       -
           version = "1.05";

     

       9751
       9751
       +
           version = "1.06";

     

       9719
       9752
        
           src = fetchurl {

     

       9720
       9720
       -
             url = "mirror://cpan/authors/id/U/UR/URI/File-ReadBackwards-1.05.tar.gz";

     

       9721
       9721
       -
             hash = "sha256-grJhr4dQfMPn5miZxFcQTryNHAn7hcU/Z8H5D3DxjW4=";

     

       9753
       9753
       +
             url = "mirror://cpan/authors/id/P/PL/PLICEASE/File-ReadBackwards-1.06.tar.gz";

     

       9754
       9754
       +
             hash = "sha256-MrKgVJOJqviIde8D1+u//y1ZeeyoW3yBL2tLsQ0QL2I=";

     

       9722
       9755
        
           };

     

       9723
       9756
        
           meta = {

     

       9724
       9757
        
             description = "Read a file backwards by lines";

     
···

       10115
       10148
        
       

     

       10116
       10149
        
         Future = buildPerlModule {

     

       10117
       10150
        
           pname = "Future";

     

       10118
       10118
       -
           version = "0.48";

     

       10151
       10151
       +
           version = "0.50";

     

       10119
       10152
        
           src = fetchurl {

     

       10120
       10120
       -
             url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-0.48.tar.gz";

     

       10121
       10121
       -
             hash = "sha256-D+ixXBQvKjBKMXGKIKEFA6m0TMASw69eN7i34koHUqM=";

     

       10153
       10153
       +
             url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-0.50.tar.gz";

     

       10154
       10154
       +
             hash = "sha256-wDXj2eaaOvFEszrINN7p5lrTYPKlHbnxWNw0Ls3dX0Q=";

     

       10122
       10155
        
           };

     

       10123
       10123
       -
           buildInputs = [ TestFatal TestIdentity TestRefcount ];

     

       10156
       10156
       +
           buildInputs = [ Test2Suite ];

     

       10124
       10157
        
           meta = {

     

       10125
       10158
        
             description = "Represent an operation awaiting completion";

     

       10126
       10159
        
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     
···

       10129
       10162
        
       

     

       10130
       10163
        
         FutureAsyncAwait = buildPerlModule rec {

     

       10131
       10164
        
           pname = "Future-AsyncAwait";

     

       10132
       10132
       -
           version = "0.58";

     

       10165
       10165
       +
           version = "0.66";

     

       10133
       10166
        
           src = fetchurl {

     

       10134
       10134
       -
             url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-0.58.tar.gz";

     

       10135
       10135
       -
             hash = "sha256-OLtJ9jabBUrAUuaNomR/4i0Io605rgNuJ6KRELtOQi4=";

     

       10167
       10167
       +
             url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-0.66.tar.gz";

     

       10168
       10168
       +
             hash = "sha256-xqD03kYr8yS1usoXddGZ7DJGo1jBPbm2Ssv82+bl7CE=";

     

       10136
       10169
        
           };

     

       10137
       10137
       -
           buildInputs = [ TestRefcount TestFatal ];

     

       10170
       10170
       +
           buildInputs = [ Test2Suite ];

     

       10138
       10171
        
           propagatedBuildInputs = [ Future XSParseKeyword XSParseSublike ];

     

       10139
       10172
        
           perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC";

     

       10140
       10173
        
           meta = {

     
···

       12986
       13019
        
       

     

       12987
       13020
        
         JSONValidator = buildPerlPackage {

     

       12988
       13021
        
           pname = "JSON-Validator";

     

       12989
       12989
       -
           version = "5.08";

     

       13022
       13022
       +
           version = "5.14";

     

       12990
       13023
        
           src = fetchurl {

     

       12991
       12991
       -
             url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-5.08.tar.gz";

     

       12992
       12992
       -
             hash = "sha256-QPaWjtcfxv1Ij6Q1Ityhk5NDhUCSth/eZgHwcWZHeFg=";

     

       13024
       13024
       +
             url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-5.14.tar.gz";

     

       13025
       13025
       +
             hash = "sha256-YISl1AdeQhqTj/su6XuFBPqjXoZtD3tbWBETr17ijhs=";

     

       12993
       13026
        
           };

     

       12994
       13027
        
           buildInputs = [ TestDeep ];

     

       12995
       12995
       -
           propagatedBuildInputs = [ DataValidateDomain DataValidateIP Mojolicious NetIDNEncode YAMLLibYAML ];

     

       13028
       13028
       +
           propagatedBuildInputs = [ Mojolicious YAMLLibYAML ];

     

       12996
       13029
        
           meta = {

     

       12997
       13030
        
             description = "Validate data against a JSON schema";

     

       12998
       13031
        
             homepage = "https://github.com/mojolicious/json-validator";

+12

pkgs/top-level/python-packages.nix

···

       3271
       3271
        
       

     

       3272
       3272
        
         dragonfly = callPackage ../development/python-modules/dragonfly { };

     

       3273
       3273
        
       

     

       3274
       3274
       +
         dramatiq = callPackage ../development/python-modules/dramatiq { };

     

       3275
       3275
       +
       

     

       3274
       3276
        
         drawille = callPackage ../development/python-modules/drawille { };

     

       3275
       3277
        
       

     

       3276
       3278
        
         drawilleplot = callPackage ../development/python-modules/drawilleplot { };

     
···

       3969
       3971
        
         flask-compress = callPackage ../development/python-modules/flask-compress { };

     

       3970
       3972
        
       

     

       3971
       3973
        
         flask-cors = callPackage ../development/python-modules/flask-cors { };

     

       3974
       3974
       +
       

     

       3975
       3975
       +
         flask-dramatiq = callPackage ../development/python-modules/flask-dramatiq { };

     

       3972
       3976
        
       

     

       3973
       3977
        
         flask-elastic = callPackage ../development/python-modules/flask-elastic { };

     

       3974
       3978
        
       

     
···

       8853
       8857
        
         perfplot = callPackage ../development/python-modules/perfplot { };

     

       8854
       8858
        
       

     

       8855
       8859
        
         periodictable = callPackage ../development/python-modules/periodictable { };

     

       8860
       8860
       +
       

     

       8861
       8861
       +
         periodiq = callPackage ../development/python-modules/periodiq { };

     

       8856
       8862
        
       

     

       8857
       8863
        
         permissionedforms = callPackage ../development/python-modules/permissionedforms { };

     

       8858
       8864
        
       

     
···

       13358
       13364
        
       

     

       13359
       13365
        
         static3 = callPackage ../development/python-modules/static3 { };

     

       13360
       13366
        
       

     

       13367
       13367
       +
         staticmap = callPackage ../development/python-modules/staticmap { };

     

       13368
       13368
       +
       

     

       13361
       13369
        
         staticjinja = callPackage ../development/python-modules/staticjinja { };

     

       13362
       13370
        
       

     

       13363
       13371
        
         statistics = callPackage ../development/python-modules/statistics { };

     
···

       14951
       14959
        
       

     

       14952
       14960
        
         types-beautifulsoup4 = callPackage ../development/python-modules/types-beautifulsoup4 { };

     

       14953
       14961
        
       

     

       14962
       14962
       +
         types-click = callPackage ../development/python-modules/types-click { };

     

       14963
       14963
       +
       

     

       14954
       14964
        
         types-colorama = callPackage ../development/python-modules/types-colorama { };

     

       14955
       14965
        
       

     

       14956
       14966
        
         types-dateutil = callPackage ../development/python-modules/types-dateutil { };

     
···

       15434
       15444
        
         watchdog = callPackage ../development/python-modules/watchdog {

     

       15435
       15445
        
           inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;

     

       15436
       15446
        
         };

     

       15447
       15447
       +
       

     

       15448
       15448
       +
         watchdog-gevent = callPackage ../development/python-modules/watchdog-gevent { };

     

       15437
       15449
        
       

     

       15438
       15450
        
         watchfiles = callPackage ../development/python-modules/watchfiles {

     

       15439
       15451
        
           inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;