commit 26d9061f294fbec3f8fd2d0ad212a8d4a89ad442 · pyrox.dev/nixpkgs

+2 -2

ci/request-reviews/request-reviewers.sh

···

       69
       69
        
       done

     

       70
       70
        
       

     

       71
       71
        
       if [[ "${#users[@]}" -gt 10 ]]; then

     

       72
       72
       -
           log "Too many reviewers (${!users[@]}), skipping review requests"

     

       73
       73
       -
           exit 1

     

       72
       72
       +
           log "Too many reviewers (${!users[*]}), skipping review requests"

     

       73
       73
       +
           exit 0

     

       74
       74
        
       fi

     

       75
       75
        
       

     

       76
       76
        
       for user in "${!users[@]}"; do

+3 -1

maintainers/maintainer-list.nix

···

       7069
       7069
        
         };

     

       7070
       7070
        
         ethancedwards8 = {

     

       7071
       7071
        
           email = "ethan@ethancedwards.com";

     

       7072
       7072
       +
           matrix = "@ethancedwards8:matrix.org";

     

       7072
       7073
        
           github = "ethancedwards8";

     

       7073
       7074
        
           githubId = 60861925;

     

       7074
       7075
        
           name = "Ethan Carter Edwards";

     
···

       8343
       8344
        
           name = "Tobias Happ";

     

       8344
       8345
        
         };

     

       8345
       8346
        
         getchoo = {

     

       8347
       8347
       +
           name = "Seth Flynn";

     

       8346
       8348
        
           email = "getchoo@tuta.io";

     

       8349
       8349
       +
           matrix = "@getchoo:matrix.org";

     

       8347
       8350
        
           github = "getchoo";

     

       8348
       8351
        
           githubId = 48872998;

     

       8349
       8349
       -
           name = "Seth";

     

       8350
       8352
        
         };

     

       8351
       8353
        
         getpsyched = {

     

       8352
       8354
        
           name = "Priyanshu Tripathi";

+2

maintainers/scripts/luarocks-packages.csv

···

       122
       122
        
       nui.nvim,,,,,,mrcjkb

     

       123
       123
        
       nvim-cmp,https://raw.githubusercontent.com/hrsh7th/nvim-cmp/main/nvim-cmp-scm-1.rockspec,,,,,

     

       124
       124
        
       nvim-nio,,,,,,mrcjkb

     

       125
       125
       +
       orgmode,,,,,,

     

       125
       126
        
       pathlib.nvim,,,,,,

     

       126
       127
        
       papis-nvim,,,,,,GaetanLepage

     

       127
       128
        
       penlight,,,,,,alerque

     
···

       148
       149
        
       tl,,,,,,mephistophiles

     

       149
       150
        
       toml-edit,,,,,5.1,mrcjkb

     

       150
       151
        
       tree-sitter-norg,,,,,5.1,mrcjkb

     

       152
       152
       +
       tree-sitter-orgmode,,,,,,

     

       151
       153
        
       vstruct,,,,,,

     

       152
       154
        
       vusted,,,,,,figsoda

     

       153
       155
        
       xml2lua,,,,,,teto

+4

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

···

       81
       81
        
       

     

       82
       82
        
       - [Conduwuit](https://conduwuit.puppyirl.gay/), a federated chat server implementing the Matrix protocol, forked from Conduit. Available as [services.conduwuit](#opt-services.conduwuit.enable).

     

       83
       83
        
       

     

       84
       84
       +
       - [Readeck](https://readeck.org/), a read-it later web-application. Available as [services.readeck](#opt-services.readeck.enable).

     

       85
       85
       +
       

     

       84
       86
        
       - [Traccar](https://www.traccar.org/), a modern GPS Tracking Platform. Available as [services.traccar](#opt-services.traccar.enable).

     

       85
       87
        
       

     

       86
       88
        
       - [Schroot](https://codeberg.org/shelter/reschroot), a lightweight virtualisation tool. Securely enter a chroot and run a command or login shell. Available as [programs.schroot](#opt-programs.schroot.enable).

     
···

       114
       116
        
       - [immich-public-proxy](https://github.com/alangrainger/immich-public-proxy), a proxy for sharing Immich albums without exposing the Immich API. Available as [services.immich-public-proxy](#opt-services.immich-public-proxy.enable).

     

       115
       117
        
       

     

       116
       118
        
       - [Zipline](https://zipline.diced.sh/), a ShareX/file upload server that is easy to use, packed with features, and with an easy setup. Available as [services.zipline](#opt-services.zipline.enable).

     

       119
       119
       +
       

     

       120
       120
       +
       - [Fider](https://fider.io/), an open platform to collect and prioritize feedback. Available as [services.fider](#opt-services.fider.enable).

     

       117
       121
        
       

     

       118
       122
        
       - [mqtt-exporter](https://github.com/kpetremann/mqtt-exporter/), a Prometheus exporter for exposing messages from MQTT. Available as [services.prometheus.exporters.mqtt](#opt-services.prometheus.exporters.mqtt.enable).

     

       119
       123

+2

nixos/modules/module-list.nix

···

       1474
       1474
        
         ./services/web-apps/eintopf.nix

     

       1475
       1475
        
         ./services/web-apps/engelsystem.nix

     

       1476
       1476
        
         ./services/web-apps/ethercalc.nix

     

       1477
       1477
       +
         ./services/web-apps/fider.nix

     

       1477
       1478
        
         ./services/web-apps/filesender.nix

     

       1478
       1479
        
         ./services/web-apps/firefly-iii.nix

     

       1479
       1480
        
         ./services/web-apps/firefly-iii-data-importer.nix

     
···

       1566
       1567
        
         ./services/web-apps/screego.nix

     

       1567
       1568
        
         ./services/web-apps/sftpgo.nix

     

       1568
       1569
        
         ./services/web-apps/suwayomi-server.nix

     

       1570
       1570
       +
         ./services/web-apps/readeck.nix

     

       1569
       1571
        
         ./services/web-apps/rss-bridge.nix

     

       1570
       1572
        
         ./services/web-apps/selfoss.nix

     

       1571
       1573
        
         ./services/web-apps/shiori.nix

+124

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

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       let

     

       8
       8
       +
         cfg = config.services.fider;

     

       9
       9
       +
         fiderCmd = lib.getExe cfg.package;

     

       10
       10
       +
       in

     

       11
       11
       +
       {

     

       12
       12
       +
         options = {

     

       13
       13
       +
       

     

       14
       14
       +
           services.fider = {

     

       15
       15
       +
             enable = lib.mkEnableOption "the Fider server";

     

       16
       16
       +
             package = lib.mkPackageOption pkgs "fider" { };

     

       17
       17
       +
       

     

       18
       18
       +
             dataDir = lib.mkOption {

     

       19
       19
       +
               type = lib.types.str;

     

       20
       20
       +
               default = "/var/lib/fider";

     

       21
       21
       +
               description = "Default data folder for Fider.";

     

       22
       22
       +
               example = "/mnt/fider";

     

       23
       23
       +
             };

     

       24
       24
       +
       

     

       25
       25
       +
             database = {

     

       26
       26
       +
               url = lib.mkOption {

     

       27
       27
       +
                 type = lib.types.str;

     

       28
       28
       +
                 default = "local";

     

       29
       29
       +
                 description = ''

     

       30
       30
       +
                   URI to use for the main PostgreSQL database. If this needs to include

     

       31
       31
       +
                   credentials that shouldn't be world-readable in the Nix store, set an

     

       32
       32
       +
                   environment file on the systemd service and override the

     

       33
       33
       +
                   `DATABASE_URL` entry. Pass the string

     

       34
       34
       +
                   `local` to setup a database on the local server.

     

       35
       35
       +
                 '';

     

       36
       36
       +
               };

     

       37
       37
       +
             };

     

       38
       38
       +
       

     

       39
       39
       +
             environment = lib.mkOption {

     

       40
       40
       +
               type = lib.types.attrsOf lib.types.str;

     

       41
       41
       +
               default = { };

     

       42
       42
       +
               example = {

     

       43
       43
       +
                 PORT = "31213";

     

       44
       44
       +
                 BASE_URL = "https://fider.example.com";

     

       45
       45
       +
                 EMAIL = "smtp";

     

       46
       46
       +
                 EMAIL_NOREPLY = "fider@example.com";

     

       47
       47
       +
                 EMAIL_SMTP_USERNAME = "fider@example.com";

     

       48
       48
       +
                 EMAIL_SMTP_HOST = "mail.example.com";

     

       49
       49
       +
                 EMAIL_SMTP_PORT = "587";

     

       50
       50
       +
                 BLOB_STORAGE = "fs";

     

       51
       51
       +
               };

     

       52
       52
       +
               description = ''

     

       53
       53
       +
                 Environment variables to set for the service. Secrets should be

     

       54
       54
       +
                 specified using {option}`environmentFiles`.

     

       55
       55
       +
                 Refer to <https://github.com/getfider/fider/blob/stable/.example.env>

     

       56
       56
       +
                 and <https://github.com/getfider/fider/blob/stable/app/pkg/env/env.go>

     

       57
       57
       +
                 for available options.

     

       58
       58
       +
               '';

     

       59
       59
       +
             };

     

       60
       60
       +
       

     

       61
       61
       +
             environmentFiles = lib.mkOption {

     

       62
       62
       +
               type = lib.types.listOf lib.types.path;

     

       63
       63
       +
               default = [ ];

     

       64
       64
       +
               example = "/run/secrets/fider.env";

     

       65
       65
       +
               description = ''

     

       66
       66
       +
                 Files to load environment variables from. Loaded variables override

     

       67
       67
       +
                 values set in {option}`environment`.

     

       68
       68
       +
               '';

     

       69
       69
       +
             };

     

       70
       70
       +
           };

     

       71
       71
       +
         };

     

       72
       72
       +
       

     

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

     

       74
       74
       +
           services.postgresql = lib.mkIf (cfg.database.url == "local") {

     

       75
       75
       +
             enable = true;

     

       76
       76
       +
             ensureUsers = [

     

       77
       77
       +
               {

     

       78
       78
       +
                 name = "fider";

     

       79
       79
       +
                 ensureDBOwnership = true;

     

       80
       80
       +
               }

     

       81
       81
       +
             ];

     

       82
       82
       +
             ensureDatabases = [ "fider" ];

     

       83
       83
       +
           };

     

       84
       84
       +
       

     

       85
       85
       +
           systemd.services.fider = {

     

       86
       86
       +
             description = "Fider server";

     

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

     

       88
       88
       +
             after = [

     

       89
       89
       +
               "network.target"

     

       90
       90
       +
             ] ++ lib.optionals (cfg.database.url == "local") [ "postgresql.service" ];

     

       91
       91
       +
             requires = lib.optionals (cfg.database.url == "local") [ "postgresql.service" ];

     

       92
       92
       +
             environment =

     

       93
       93
       +
               let

     

       94
       94
       +
                 localPostgresqlUrl = "postgres:///fider?host=/run/postgresql";

     

       95
       95
       +
               in

     

       96
       96
       +
               {

     

       97
       97
       +
                 DATABASE_URL = if (cfg.database.url == "local") then localPostgresqlUrl else cfg.database.url;

     

       98
       98
       +
                 BLOB_STORAGE_FS_PATH = "${cfg.dataDir}";

     

       99
       99
       +
               }

     

       100
       100
       +
               // cfg.environment;

     

       101
       101
       +
             serviceConfig = {

     

       102
       102
       +
               ExecStartPre = "${fiderCmd} migrate";

     

       103
       103
       +
               ExecStart = fiderCmd;

     

       104
       104
       +
               StateDirectory = "fider";

     

       105
       105
       +
               DynamicUser = true;

     

       106
       106
       +
               PrivateTmp = "yes";

     

       107
       107
       +
               Restart = "on-failure";

     

       108
       108
       +
               RuntimeDirectory = "fider";

     

       109
       109
       +
               RuntimeDirectoryPreserve = true;

     

       110
       110
       +
               CacheDirectory = "fider";

     

       111
       111
       +
               WorkingDirectory = "${cfg.package}";

     

       112
       112
       +
               EnvironmentFile = cfg.environmentFiles;

     

       113
       113
       +
             };

     

       114
       114
       +
           };

     

       115
       115
       +
         };

     

       116
       116
       +
       

     

       117
       117
       +
         meta = {

     

       118
       118
       +
           maintainers = with lib.maintainers; [

     

       119
       119
       +
             drupol

     

       120
       120
       +
             niklaskorz

     

       121
       121
       +
           ];

     

       122
       122
       +
           # doc = ./fider.md;

     

       123
       123
       +
         };

     

       124
       124
       +
       }

+96

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

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         pkgs,

     

       4
       4
       +
         lib,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       let

     

       9
       9
       +
         inherit (lib)

     

       10
       10
       +
           mkEnableOption

     

       11
       11
       +
           mkPackageOption

     

       12
       12
       +
           mkOption

     

       13
       13
       +
           mkIf

     

       14
       14
       +
           types

     

       15
       15
       +
           ;

     

       16
       16
       +
         cfg = config.services.readeck;

     

       17
       17
       +
         settingsFormat = pkgs.formats.toml { };

     

       18
       18
       +
         configFile = settingsFormat.generate "readeck.toml" cfg.settings;

     

       19
       19
       +
       

     

       20
       20
       +
       in

     

       21
       21
       +
       {

     

       22
       22
       +
       

     

       23
       23
       +
         meta.maintainers = [ lib.maintainers.julienmalka ];

     

       24
       24
       +
       

     

       25
       25
       +
         options = {

     

       26
       26
       +
           services.readeck = {

     

       27
       27
       +
             enable = mkEnableOption "Readeck";

     

       28
       28
       +
       

     

       29
       29
       +
             package = mkPackageOption pkgs "readeck" { };

     

       30
       30
       +
       

     

       31
       31
       +
             environmentFile = mkOption {

     

       32
       32
       +
               type = types.nullOr types.path;

     

       33
       33
       +
               description = ''

     

       34
       34
       +
                 File containing environment variables to be passed to Readeck.

     

       35
       35
       +
                 May be used to provide the Readeck secret key by setting the READECK_SECRET_KEY variable.

     

       36
       36
       +
               '';

     

       37
       37
       +
               default = null;

     

       38
       38
       +
             };

     

       39
       39
       +
       

     

       40
       40
       +
             settings = mkOption {

     

       41
       41
       +
               type = settingsFormat.type;

     

       42
       42
       +
               default = { };

     

       43
       43
       +
               example = {

     

       44
       44
       +
                 main.log_level = "debug";

     

       45
       45
       +
                 server.port = 9000;

     

       46
       46
       +
               };

     

       47
       47
       +
               description = ''

     

       48
       48
       +
                 Additional configuration for Readeck, see

     

       49
       49
       +
                 <https://readeck.org/en/docs/configuration>

     

       50
       50
       +
                 for supported values.

     

       51
       51
       +
               '';

     

       52
       52
       +
             };

     

       53
       53
       +
       

     

       54
       54
       +
           };

     

       55
       55
       +
         };

     

       56
       56
       +
       

     

       57
       57
       +
         config = mkIf cfg.enable {

     

       58
       58
       +
           systemd.services.readeck = {

     

       59
       59
       +
             description = "Readeck";

     

       60
       60
       +
             after = [ "network.target" ];

     

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

     

       62
       62
       +
             serviceConfig = {

     

       63
       63
       +
               Type = "simple";

     

       64
       64
       +
               StateDirectory = "readeck";

     

       65
       65
       +
               WorkingDirectory = "/var/lib/readeck";

     

       66
       66
       +
               EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile;

     

       67
       67
       +
               DynamicUser = true;

     

       68
       68
       +
               ExecStart = "${lib.getExe cfg.package} serve -config ${configFile}";

     

       69
       69
       +
               ProtectSystem = "full";

     

       70
       70
       +
               SystemCallArchitectures = "native";

     

       71
       71
       +
               MemoryDenyWriteExecute = true;

     

       72
       72
       +
               NoNewPrivileges = true;

     

       73
       73
       +
               PrivateTmp = true;

     

       74
       74
       +
               PrivateDevices = true;

     

       75
       75
       +
               RestrictAddressFamilies = [

     

       76
       76
       +
                 "AF_INET"

     

       77
       77
       +
                 "AF_INET6"

     

       78
       78
       +
                 "AF_UNIX"

     

       79
       79
       +
                 "AF_NETLINK"

     

       80
       80
       +
               ];

     

       81
       81
       +
               RestrictNamespaces = true;

     

       82
       82
       +
               RestrictRealtime = true;

     

       83
       83
       +
               DevicePolicy = "closed";

     

       84
       84
       +
               ProtectClock = true;

     

       85
       85
       +
               ProtectHostname = true;

     

       86
       86
       +
               ProtectProc = "invisible";

     

       87
       87
       +
               ProtectControlGroups = true;

     

       88
       88
       +
               ProtectKernelModules = true;

     

       89
       89
       +
               ProtectKernelTunables = true;

     

       90
       90
       +
               LockPersonality = true;

     

       91
       91
       +
               Restart = "on-failure";

     

       92
       92
       +
       

     

       93
       93
       +
             };

     

       94
       94
       +
           };

     

       95
       95
       +
         };

     

       96
       96
       +
       }

+31 -21

nixos/modules/services/web-servers/garage.nix

···

       11
       11
        
         cfg = config.services.garage;

     

       12
       12
        
         toml = pkgs.formats.toml { };

     

       13
       13
        
         configFile = toml.generate "garage.toml" cfg.settings;

     

       14
       14
       -
       

     

       15
       15
       -
         anyHasPrefix =

     

       16
       16
       -
           prefix: strOrList:

     

       17
       17
       -
           if isString strOrList then

     

       18
       18
       -
             hasPrefix prefix strOrList

     

       19
       19
       -
           else

     

       20
       20
       -
             any ({ path, ... }: hasPrefix prefix path) strOrList;

     

       21
       14
        
       in

     

       22
       15
        
       {

     

       23
       16
        
         meta = {

     

       24
       17
        
           doc = ./garage.md;

     

       25
       25
       -
           maintainers = [ maintainers.mjm ];

     

       18
       18
       +
           maintainers = with lib.maintainers; [

     

       19
       19
       +
             mjm

     

       20
       20
       +
             cything

     

       21
       21
       +
           ];

     

       26
       22
        
         };

     

       27
       23
        
       

     

       28
       24
        
         options.services.garage = {

     
···

       44
       40
        
           };

     

       45
       41
        
       

     

       46
       42
        
           logLevel = mkOption {

     

       47
       47
       -
             type = types.enum ([

     

       43
       43
       +
             type = types.enum [

     

       48
       44
        
               "error"

     

       49
       45
        
               "warn"

     

       50
       46
        
               "info"

     

       51
       47
        
               "debug"

     

       52
       48
        
               "trace"

     

       53
       53
       -
             ]);

     

       49
       49
       +
             ];

     

       54
       50
        
             default = "info";

     

       55
       51
        
             example = "debug";

     

       56
       52
        
             description = "Garage log level, see <https://garagehq.deuxfleurs.fr/documentation/quick-start/#launching-the-garage-server> for examples.";

     
···

       125
       121
        
             restartTriggers = [

     

       126
       122
        
               configFile

     

       127
       123
        
             ] ++ (lib.optional (cfg.environmentFile != null) cfg.environmentFile);

     

       128
       128
       -
             serviceConfig = {

     

       129
       129
       -
               ExecStart = "${cfg.package}/bin/garage server";

     

       124
       124
       +
             serviceConfig =

     

       125
       125
       +
               let

     

       126
       126
       +
                 paths = lib.flatten (

     

       127
       127
       +
                   with cfg.settings;

     

       128
       128
       +
                   [

     

       129
       129
       +
                     metadata_dir

     

       130
       130
       +
                   ]

     

       131
       131
       +
                   # data_dir can either be a string or a list of attrs

     

       132
       132
       +
                   # if data_dir is a list, the actual path will in in the `path` attribute of each item

     

       133
       133
       +
                   # see https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#data_dir

     

       134
       134
       +
                   ++ lib.optional (lib.isList data_dir) (map (item: item.path) data_dir)

     

       135
       135
       +
                   ++ lib.optional (lib.isString data_dir) [ data_dir ]

     

       136
       136
       +
                 );

     

       137
       137
       +
                 isDefault = lib.hasPrefix "/var/lib/garage";

     

       138
       138
       +
                 isDefaultStateDirectory = lib.any isDefault paths;

     

       139
       139
       +
               in

     

       140
       140
       +
               {

     

       141
       141
       +
                 ExecStart = "${cfg.package}/bin/garage server";

     

       130
       142
        
       

     

       131
       131
       -
               StateDirectory = mkIf (

     

       132
       132
       -
                 anyHasPrefix "/var/lib/garage" cfg.settings.data_dir

     

       133
       133
       -
                 || hasPrefix "/var/lib/garage" cfg.settings.metadata_dir

     

       134
       134
       -
               ) "garage";

     

       135
       135
       -
               DynamicUser = lib.mkDefault true;

     

       136
       136
       -
               ProtectHome = true;

     

       137
       137
       -
               NoNewPrivileges = true;

     

       138
       138
       -
               EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile;

     

       139
       139
       -
             };

     

       143
       143
       +
                 StateDirectory = lib.mkIf isDefaultStateDirectory "garage";

     

       144
       144
       +
                 DynamicUser = lib.mkDefault true;

     

       145
       145
       +
                 ProtectHome = true;

     

       146
       146
       +
                 NoNewPrivileges = true;

     

       147
       147
       +
                 EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile;

     

       148
       148
       +
                 ReadWritePaths = lib.filter (x: !(isDefault x)) (lib.flatten [ paths ]);

     

       149
       149
       +
               };

     

       140
       150
        
             environment = {

     

       141
       151
        
               RUST_LOG = lib.mkDefault "garage=${cfg.logLevel}";

     

       142
       152
        
             } // cfg.extraEnvironment;

+2

nixos/tests/all-tests.nix

···

       336
       336
        
         fenics = handleTest ./fenics.nix {};

     

       337
       337
        
         ferm = handleTest ./ferm.nix {};

     

       338
       338
        
         ferretdb = handleTest ./ferretdb.nix {};

     

       339
       339
       +
         fider = runTest ./fider.nix;

     

       339
       340
        
         filesender = handleTest ./filesender.nix {};

     

       340
       341
        
         filesystems-overlayfs = runTest ./filesystems-overlayfs.nix;

     

       341
       342
        
         firefly-iii = handleTest ./firefly-iii.nix {};

     
···

       893
       894
        
         rathole = handleTest ./rathole.nix {};

     

       894
       895
        
         readarr = handleTest ./readarr.nix {};

     

       895
       896
        
         realm = handleTest ./realm.nix {};

     

       897
       897
       +
         readeck = runTest ./readeck.nix;

     

       896
       898
        
         redis = handleTest ./redis.nix {};

     

       897
       899
        
         redlib = handleTest ./redlib.nix {};

     

       898
       900
        
         redmine = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./redmine.nix {};

+33

nixos/tests/fider.nix

···

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         name = "fider-server";

     

       5
       5
       +
       

     

       6
       6
       +
         nodes = {

     

       7
       7
       +
           machine =

     

       8
       8
       +
             { pkgs, ... }:

     

       9
       9
       +
             {

     

       10
       10
       +
               services.fider = {

     

       11
       11
       +
                 enable = true;

     

       12
       12
       +
                 environment = {

     

       13
       13
       +
                   JWT_SECRET = "not_so_secret";

     

       14
       14
       +
                   BASE_URL = "/";

     

       15
       15
       +
                   EMAIL_NOREPLY = "noreply@fider.io";

     

       16
       16
       +
                   EMAIL_SMTP_HOST = "mailhog";

     

       17
       17
       +
                   EMAIL_SMTP_PORT = "1025";

     

       18
       18
       +
                 };

     

       19
       19
       +
               };

     

       20
       20
       +
             };

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         testScript = ''

     

       24
       24
       +
           machine.start()

     

       25
       25
       +
           machine.wait_for_unit("fider.service")

     

       26
       26
       +
           machine.wait_for_open_port(3000)

     

       27
       27
       +
         '';

     

       28
       28
       +
       

     

       29
       29
       +
         meta.maintainers = with lib.maintainers; [

     

       30
       30
       +
           drupol

     

       31
       31
       +
           niklaskorz

     

       32
       32
       +
         ];

     

       33
       33
       +
       }

+24

nixos/tests/readeck.nix

···

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         name = "readeck";

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ julienmalka ];

     

       6
       6
       +
       

     

       7
       7
       +
         nodes.machine =

     

       8
       8
       +
           { pkgs, ... }:

     

       9
       9
       +
           {

     

       10
       10
       +
             services.readeck = {

     

       11
       11
       +
               enable = true;

     

       12
       12
       +
               environmentFile = pkgs.writeText "env-file" ''

     

       13
       13
       +
                 READECK_SECRET_KEY="verysecretkey"

     

       14
       14
       +
               '';

     

       15
       15
       +
             };

     

       16
       16
       +
           };

     

       17
       17
       +
       

     

       18
       18
       +
         testScript = ''

     

       19
       19
       +
           machine.start()

     

       20
       20
       +
           machine.wait_for_unit("readeck.service")

     

       21
       21
       +
           machine.wait_for_open_port(8000)

     

       22
       22
       +
           machine.succeed("curl --fail http://localhost:8000/login?r=%2F")

     

       23
       23
       +
         '';

     

       24
       24
       +
       }

+3 -3

pkgs/applications/audio/youtube-music/default.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation (finalAttrs: {

     

       15
       15
        
         pname = "youtube-music";

     

       16
       16
       -
         version = "3.7.1";

     

       16
       16
       +
         version = "3.7.2";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "th-ch";

     

       20
       20
        
           repo = "youtube-music";

     

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

     

       22
       22
       -
           hash = "sha256-IV8uTfogy4LchZYIMqDDT96N+5NYE/jwSFc18EhFCb0=";

     

       22
       22
       +
           hash = "sha256-gZ3EvIjPa/THRwMigglGp+Wtv+wEN7V11KOu1QsyJpE=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         pnpmDeps = pnpm.fetchDeps {

     

       26
       26
        
           inherit (finalAttrs) pname version src;

     

       27
       27
       -
           hash = "sha256-ET4NDUtsTTY3t06VSJLa8Cjd6fP4zs71w83FlsJnq1U=";

     

       27
       27
       +
           hash = "sha256-4yeLfolBquKFjKB4iYj8rMPvclfpjwHhV6/Xb/YNQWo=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         nativeBuildInputs = [

+2 -2

pkgs/applications/graphics/gimp/default.nix

···

       45
       45
        
         libheif,

     

       46
       46
        
         libxslt,

     

       47
       47
        
         libgudev,

     

       48
       48
       -
         openexr,

     

       48
       48
       +
         openexr_3,

     

       49
       49
        
         desktopToDarwinBundle,

     

       50
       50
        
         AppKit,

     

       51
       51
        
         Cocoa,

     
···

       126
       126
        
             poppler

     

       127
       127
        
             poppler_data

     

       128
       128
        
             libtiff

     

       129
       129
       -
             openexr

     

       129
       129
       +
             openexr_3

     

       130
       130
        
             libmng

     

       131
       131
        
             librsvg

     

       132
       132
        
             libwmf

+2 -2

pkgs/applications/video/haruna/default.nix

···

       26
       26
        
       

     

       27
       27
        
       stdenv.mkDerivation rec {

     

       28
       28
        
         pname = "haruna";

     

       29
       29
       -
         version = "1.2.1";

     

       29
       29
       +
         version = "1.3.0";

     

       30
       30
        
       

     

       31
       31
        
         src = fetchFromGitLab {

     

       32
       32
        
           owner = "multimedia";

     

       33
       33
        
           repo = "haruna";

     

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

     

       35
       35
       -
           hash = "sha256-RxHCs5NiKORikbTyNwRD27aQfX5id4K/Lp1bQ8cAwVo=";

     

       35
       35
       +
           hash = "sha256-9KvqZzB9n4x11xhdEkdn0lxv92dbcWWbyL7GjqvfJhA=";

     

       36
       36
        
           domain = "invent.kde.org";

     

       37
       37
        
         };

     

       38
       38

+70

pkgs/by-name/du/duckstation/003-fix-NEON-intrinsics.patch

···

       1
       1
       +
       From 19e094e5c7aaaf375a13424044521701e85c8313 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: OPNA2608 <opna2608@protonmail.com>

     

       3
       3
       +
       Date: Thu, 9 Jan 2025 17:46:25 +0100

     

       4
       4
       +
       Subject: [PATCH] Fix usage of NEON intrinsics

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        src/common/gsvector_neon.h | 12 ++++++------

     

       8
       8
       +
        1 file changed, 6 insertions(+), 6 deletions(-)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/src/common/gsvector_neon.h b/src/common/gsvector_neon.h

     

       11
       11
       +
       index e4991af5e..61b8dc09b 100644

     

       12
       12
       +
       --- a/src/common/gsvector_neon.h

     

       13
       13
       +
       +++ b/src/common/gsvector_neon.h

     

       14
       14
       +
       @@ -867,7 +867,7 @@ public:

     

       15
       15
       +
        

     

       16
       16
       +
          ALWAYS_INLINE int mask() const

     

       17
       17
       +
          {

     

       18
       18
       +
       -    const uint32x2_t masks = vshr_n_u32(vreinterpret_u32_s32(v2s), 31);

     

       19
       19
       +
       +    const uint32x2_t masks = vshr_n_u32(vreinterpret_u32_f32(v2s), 31);

     

       20
       20
       +
            return (vget_lane_u32(masks, 0) | (vget_lane_u32(masks, 1) << 1));

     

       21
       21
       +
          }

     

       22
       22
       +
        

     

       23
       23
       +
       @@ -2882,7 +2882,7 @@ public:

     

       24
       24
       +
          ALWAYS_INLINE GSVector4 gt64(const GSVector4& v) const

     

       25
       25
       +
          {

     

       26
       26
       +
        #ifdef CPU_ARCH_ARM64

     

       27
       27
       +
       -    return GSVector4(vreinterpretq_f32_f64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));

     

       28
       28
       +
       +    return GSVector4(vreinterpretq_f32_u64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));

     

       29
       29
       +
        #else

     

       30
       30
       +
            GSVector4 ret;

     

       31
       31
       +
            ret.U64[0] = (F64[0] > v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0;

     

       32
       32
       +
       @@ -2894,7 +2894,7 @@ public:

     

       33
       33
       +
          ALWAYS_INLINE GSVector4 eq64(const GSVector4& v) const

     

       34
       34
       +
          {

     

       35
       35
       +
        #ifdef CPU_ARCH_ARM64

     

       36
       36
       +
       -    return GSVector4(vreinterpretq_f32_f64(vceqq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));

     

       37
       37
       +
       +    return GSVector4(vreinterpretq_f32_u64(vceqq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));

     

       38
       38
       +
        #else

     

       39
       39
       +
            GSVector4 ret;

     

       40
       40
       +
            ret.U64[0] = (F64[0] == v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0;

     

       41
       41
       +
       @@ -2906,7 +2906,7 @@ public:

     

       42
       42
       +
          ALWAYS_INLINE GSVector4 lt64(const GSVector4& v) const

     

       43
       43
       +
          {

     

       44
       44
       +
        #ifdef CPU_ARCH_ARM64

     

       45
       45
       +
       -    return GSVector4(vreinterpretq_f32_f64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));

     

       46
       46
       +
       +    return GSVector4(vreinterpretq_f32_u64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));

     

       47
       47
       +
        #else

     

       48
       48
       +
            GSVector4 ret;

     

       49
       49
       +
            ret.U64[0] = (F64[0] < v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0;

     

       50
       50
       +
       @@ -2918,7 +2918,7 @@ public:

     

       51
       51
       +
          ALWAYS_INLINE GSVector4 ge64(const GSVector4& v) const

     

       52
       52
       +
          {

     

       53
       53
       +
        #ifdef CPU_ARCH_ARM64

     

       54
       54
       +
       -    return GSVector4(vreinterpretq_f32_f64(vcgeq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));

     

       55
       55
       +
       +    return GSVector4(vreinterpretq_f32_u64(vcgeq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));

     

       56
       56
       +
        #else

     

       57
       57
       +
            GSVector4 ret;

     

       58
       58
       +
            ret.U64[0] = (F64[0] >= v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0;

     

       59
       59
       +
       @@ -2930,7 +2930,7 @@ public:

     

       60
       60
       +
          ALWAYS_INLINE GSVector4 le64(const GSVector4& v) const

     

       61
       61
       +
          {

     

       62
       62
       +
        #ifdef CPU_ARCH_ARM64

     

       63
       63
       +
       -    return GSVector4(vreinterpretq_f32_f64(vcleq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));

     

       64
       64
       +
       +    return GSVector4(vreinterpretq_f32_u64(vcleq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s))));

     

       65
       65
       +
        #else

     

       66
       66
       +
            GSVector4 ret;

     

       67
       67
       +
            ret.U64[0] = (F64[0] <= v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0;

     

       68
       68
       +
       -- 

     

       69
       69
       +
       2.47.0

     

       70
       70
       +

+2

pkgs/by-name/du/duckstation/package.nix

···

       40
       40
        
           ./001-fix-test-inclusion.diff

     

       41
       41
        
           # Patching yet another script that fills data based on git commands . . .

     

       42
       42
        
           ./002-hardcode-vars.diff

     

       43
       43
       +
           # Fix NEON intrinsics usage

     

       44
       44
       +
           ./003-fix-NEON-intrinsics.patch

     

       43
       45
        
         ];

     

       44
       46
        
       

     

       45
       47
        
         nativeBuildInputs = [

+1 -2

pkgs/by-name/el/elkhound/package.nix

···

       50
       50
        
           homepage = "https://scottmcpeak.com/elkhound/";

     

       51
       51
        
           license = licenses.bsd3;

     

       52
       52
        
           maintainers = with maintainers; [ peterhoeg ];

     

       53
       53
       -
           # possibly works on Darwin

     

       54
       54
       -
           platforms = platforms.linux;

     

       53
       53
       +
           platforms = platforms.unix;

     

       55
       54
        
         };

     

       56
       55
        
       }

+12

pkgs/by-name/fi/fider/0001-disable-etc-copy.patch

···

       1
       1
       +
       diff --git a/app/cmd/server.go b/app/cmd/server.go

     

       2
       2
       +
       index fcfbeec2..71f01c9d 100644

     

       3
       3
       +
       --- a/app/cmd/server.go

     

       4
       4
       +
       +++ b/app/cmd/server.go

     

       5
       5
       +
       @@ -46,7 +46,6 @@ func RunServer() int {

     

       6
       6
       +
        		})

     

       7
       7
       +
        	}

     

       8
       8
       +
        

     

       9
       9
       +
       -	copyEtcFiles(ctx)

     

       10
       10
       +
        	startJobs(ctx)

     

       11
       11
       +
        

     

       12
       12
       +
        	e := routes(web.New())

+42

pkgs/by-name/fi/fider/frontend.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         esbuild,

     

       4
       4
       +
         buildNpmPackage,

     

       5
       5
       +
       

     

       6
       6
       +
         pname,

     

       7
       7
       +
         version,

     

       8
       8
       +
         src,

     

       9
       9
       +
         npmDepsHash,

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       buildNpmPackage {

     

       13
       13
       +
         inherit version src npmDepsHash;

     

       14
       14
       +
         pname = "${pname}-frontend";

     

       15
       15
       +
       

     

       16
       16
       +
         nativeBuildInputs = [ esbuild ];

     

       17
       17
       +
       

     

       18
       18
       +
         buildPhase = ''

     

       19
       19
       +
           runHook preBuild

     

       20
       20
       +
       

     

       21
       21
       +
           npx lingui extract public/

     

       22
       22
       +
           npx lingui compile

     

       23
       23
       +
           NODE_ENV=production node esbuild.config.js

     

       24
       24
       +
           NODE_ENV=production npx webpack-cli

     

       25
       25
       +
       

     

       26
       26
       +
           runHook postBuild

     

       27
       27
       +
         '';

     

       28
       28
       +
       

     

       29
       29
       +
         installPhase = ''

     

       30
       30
       +
           runHook preInstall

     

       31
       31
       +
       

     

       32
       32
       +
           mkdir -p $out

     

       33
       33
       +
           cp -r dist ssr.js favicon.png robots.txt $out/

     

       34
       34
       +
       

     

       35
       35
       +
           runHook postInstall

     

       36
       36
       +
         '';

     

       37
       37
       +
       

     

       38
       38
       +
         env = {

     

       39
       39
       +
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = 1;

     

       40
       40
       +
           ESBUILD_BINARY_PATH = lib.getExe esbuild;

     

       41
       41
       +
         };

     

       42
       42
       +
       }

+110

pkgs/by-name/fi/fider/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenvNoCC,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         callPackage,

     

       6
       6
       +
         esbuild,

     

       7
       7
       +
         buildGoModule,

     

       8
       8
       +
         nixosTests,

     

       9
       9
       +
         nix-update-script,

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       13
       13
       +
         pname = "fider";

     

       14
       14
       +
         version = "0.24.0";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "getfider";

     

       18
       18
       +
           repo = "fider";

     

       19
       19
       +
           tag = "v${finalAttrs.version}";

     

       20
       20
       +
           hash = "sha256-nzOplwsE0ppmxbTrNAgePnIQIAD/5Uu4gXlebFKWGfc=";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         dontConfigure = true;

     

       24
       24
       +
         dontBuild = true;

     

       25
       25
       +
       

     

       26
       26
       +
         # Allow easier version overrides, e.g.:

     

       27
       27
       +
         # pkgs.fider.overrideAttrs (prev: {

     

       28
       28
       +
         #   version = "...";

     

       29
       29
       +
         #   src = prev.src.override {

     

       30
       30
       +
         #     hash = "...";

     

       31
       31
       +
         #   };

     

       32
       32
       +
         #   vendorHash = "...";

     

       33
       33
       +
         #   npmDepsHash = "...";

     

       34
       34
       +
         # })

     

       35
       35
       +
         vendorHash = "sha256-CfopU72fpXiTaBtdf9A57Wb+flDu2XEtTISxImeJLL0=";

     

       36
       36
       +
         npmDepsHash = "sha256-gnboT5WQzftOCZ2Ouuza7bqpxJf+Zs7OWC8OHMZNHvw=";

     

       37
       37
       +
       

     

       38
       38
       +
         server = callPackage ./server.nix {

     

       39
       39
       +
           inherit (finalAttrs)

     

       40
       40
       +
             pname

     

       41
       41
       +
             version

     

       42
       42
       +
             src

     

       43
       43
       +
             vendorHash

     

       44
       44
       +
             ;

     

       45
       45
       +
         };

     

       46
       46
       +
         frontend = callPackage ./frontend.nix {

     

       47
       47
       +
           inherit (finalAttrs)

     

       48
       48
       +
             pname

     

       49
       49
       +
             version

     

       50
       50
       +
             src

     

       51
       51
       +
             npmDepsHash

     

       52
       52
       +
             ;

     

       53
       53
       +
           # We specify the esbuild override here instead of in frontend.nix so end users can

     

       54
       54
       +
           # again easily override it if necessary, for example when changing to an unreleased

     

       55
       55
       +
           # version of fider requiring a newer esbuild than specified here:

     

       56
       56
       +
           # pkgs.fider.overrideAttrs (prev: {

     

       57
       57
       +
           #   frontend = prev.frontend.override {

     

       58
       58
       +
           #     esbuild = ...;

     

       59
       59
       +
           #   };

     

       60
       60
       +
           # })

     

       61
       61
       +
           esbuild = esbuild.override {

     

       62
       62
       +
             buildGoModule =

     

       63
       63
       +
               args:

     

       64
       64
       +
               buildGoModule (

     

       65
       65
       +
                 args

     

       66
       66
       +
                 // rec {

     

       67
       67
       +
                   version = "0.14.38";

     

       68
       68
       +
                   src = fetchFromGitHub {

     

       69
       69
       +
                     owner = "evanw";

     

       70
       70
       +
                     repo = "esbuild";

     

       71
       71
       +
                     tag = "v${version}";

     

       72
       72
       +
                     hash = "sha256-rvMi1oC7qGidvi4zrm9KCMMntu6LJGVOGN6VmU2ivQE=";

     

       73
       73
       +
                   };

     

       74
       74
       +
                   vendorHash = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";

     

       75
       75
       +
                 }

     

       76
       76
       +
               );

     

       77
       77
       +
           };

     

       78
       78
       +
         };

     

       79
       79
       +
       

     

       80
       80
       +
         installPhase = ''

     

       81
       81
       +
           runHook preInstall

     

       82
       82
       +
       

     

       83
       83
       +
           mkdir -p $out/etc

     

       84
       84
       +
           cp -r locale views migrations $out/

     

       85
       85
       +
           cp -r etc/*.md $out/etc/

     

       86
       86
       +
           ln -s ${finalAttrs.server}/* $out/

     

       87
       87
       +
           ln -s ${finalAttrs.frontend}/* $out/

     

       88
       88
       +
       

     

       89
       89
       +
           runHook postInstall

     

       90
       90
       +
         '';

     

       91
       91
       +
       

     

       92
       92
       +
         passthru = {

     

       93
       93
       +
           tests = {

     

       94
       94
       +
             inherit (nixosTests) fider;

     

       95
       95
       +
           };

     

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

     

       97
       97
       +
         };

     

       98
       98
       +
       

     

       99
       99
       +
         meta = {

     

       100
       100
       +
           description = "Open platform to collect and prioritize feedback";

     

       101
       101
       +
           homepage = "https://github.com/getfider/fider";

     

       102
       102
       +
           changelog = "https://github.com/getfider/fider/releases/tag/${finalAttrs.src.tag}";

     

       103
       103
       +
           license = lib.licenses.agpl3Only;

     

       104
       104
       +
           mainProgram = "fider";

     

       105
       105
       +
           maintainers = with lib.maintainers; [

     

       106
       106
       +
             drupol

     

       107
       107
       +
             niklaskorz

     

       108
       108
       +
           ];

     

       109
       109
       +
         };

     

       110
       110
       +
       })

+30

pkgs/by-name/fi/fider/server.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         buildGoModule,

     

       3
       3
       +
       

     

       4
       4
       +
         pname,

     

       5
       5
       +
         version,

     

       6
       6
       +
         src,

     

       7
       7
       +
         vendorHash,

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       buildGoModule {

     

       11
       11
       +
         inherit version src vendorHash;

     

       12
       12
       +
         pname = "${pname}-server";

     

       13
       13
       +
       

     

       14
       14
       +
         patches = [

     

       15
       15
       +
           ./0001-disable-etc-copy.patch

     

       16
       16
       +
         ];

     

       17
       17
       +
       

     

       18
       18
       +
         ldflags = [

     

       19
       19
       +
           "-s"

     

       20
       20
       +
           "-w"

     

       21
       21
       +
         ];

     

       22
       22
       +
       

     

       23
       23
       +
         doCheck = false; # requires a running PostgreSQL database

     

       24
       24
       +
       

     

       25
       25
       +
         # preCheck = ''

     

       26
       26
       +
         #   set -o allexport

     

       27
       27
       +
         #   source ./.test.env

     

       28
       28
       +
         #   set +o allexport

     

       29
       29
       +
         # '';

     

       30
       30
       +
       }

+3 -3

pkgs/by-name/io/iosevka/package.nix

···

       56
       56
        
       

     

       57
       57
        
       buildNpmPackage rec {

     

       58
       58
        
         pname = "Iosevka${toString set}";

     

       59
       59
       -
         version = "32.3.1";

     

       59
       59
       +
         version = "32.4.0";

     

       60
       60
        
       

     

       61
       61
        
         src = fetchFromGitHub {

     

       62
       62
        
           owner = "be5invis";

     

       63
       63
        
           repo = "iosevka";

     

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

     

       65
       65
       -
           hash = "sha256-WoRBDLCqLglTXeXtC8ZVELgDOv18dsCDvToUq3iPoDU=";

     

       65
       65
       +
           hash = "sha256-kB4CsC/hHstajLcVYBxO7RD0lsZymrxlUha4cRtQ7Ak=";

     

       66
       66
        
         };

     

       67
       67
        
       

     

       68
       68
       -
         npmDepsHash = "sha256-gmaFzcTbocx3RYW4G4Lw/08f3c71draxRwzV0BA2/KY=";

     

       68
       68
       +
         npmDepsHash = "sha256-Qr7fN49qyaqaSutrdT7HjWis7jjwYR/S2kxkHs7EhXY=";

     

       69
       69
        
       

     

       70
       70
        
         nativeBuildInputs =

     

       71
       71
        
           [

+29 -12

pkgs/by-name/k3/k3d/package.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , buildGoModule

     

       3
       3
       -
       , fetchFromGitHub

     

       4
       4
       -
       , installShellFiles

     

       5
       5
       -
       , k3sVersion ? null

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildGoModule,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         installShellFiles,

     

       6
       6
       +
         k3sVersion ? null,

     

       6
       7
        
       }:

     

       7
       8
        
       

     

       8
       9
        
       let

     
···

       15
       16
        
       in

     

       16
       17
        
       buildGoModule rec {

     

       17
       18
        
         pname = "k3d";

     

       18
       18
       -
         version = "5.7.4";

     

       19
       19
       +
         version = "5.8.1";

     

       19
       20
        
       

     

       20
       21
        
         src = fetchFromGitHub {

     

       21
       22
        
           owner = "k3d-io";

     

       22
       23
        
           repo = "k3d";

     

       23
       24
        
           tag = "v${version}";

     

       24
       24
       -
           hash = "sha256-z+7yeX0ea/6+4aWbA5NYW/HzvVcJiSkewOvo+oXp9bE=";

     

       25
       25
       +
           hash = "sha256-o56kBcuTOrDG8ZovGsIK+LIMi2Wps3kYJrqQuJHMd+A=";

     

       25
       26
        
         };

     

       26
       27
        
       

     

       27
       28
        
         vendorHash = "sha256-lFmIRtkUiohva2Vtg4AqHaB5McVOWW5+SFShkNqYVZ8=";

     
···

       29
       30
        
       

     

       30
       31
        
         nativeBuildInputs = [ installShellFiles ];

     

       31
       32
        
       

     

       32
       32
       -
         excludedPackages = [ "tools" "docgen" ];

     

       33
       33
       +
         excludedPackages = [

     

       34
       34
       +
           "tools"

     

       35
       35
       +
           "docgen"

     

       36
       36
       +
         ];

     

       33
       37
        
       

     

       34
       38
        
         ldflags =

     

       35
       35
       -
           let t = "github.com/k3d-io/k3d/v${lib.versions.major version}/version"; in

     

       36
       36
       -
           [ "-s" "-w" "-X ${t}.Version=v${version}" ] ++ lib.optionals k3sVersionSet [ "-X ${t}.K3sVersion=v${k3sVersion}" ];

     

       39
       39
       +
           let

     

       40
       40
       +
             t = "github.com/k3d-io/k3d/v${lib.versions.major version}/version";

     

       41
       41
       +
           in

     

       42
       42
       +
           [

     

       43
       43
       +
             "-s"

     

       44
       44
       +
             "-w"

     

       45
       45
       +
             "-X ${t}.Version=v${version}"

     

       46
       46
       +
           ]

     

       47
       47
       +
           ++ lib.optionals k3sVersionSet [ "-X ${t}.K3sVersion=v${k3sVersion}" ];

     

       37
       48
        
       

     

       38
       49
        
         preCheck = ''

     

       39
       50
        
           # skip test that uses networking

     

       40
       51
        
           substituteInPlace version/version_test.go \

     

       41
       41
       -
             --replace "TestGetK3sVersion" "SkipGetK3sVersion"

     

       52
       52
       +
             --replace-fail "TestGetK3sVersion" "SkipGetK3sVersion"

     

       42
       53
        
         '';

     

       43
       54
        
       

     

       44
       55
        
         postInstall = ''

     
···

       70
       81
        
             multi-node k3s cluster on a single machine using docker.

     

       71
       82
        
           '';

     

       72
       83
        
           license = licenses.mit;

     

       73
       73
       -
           maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ricochet ];

     

       84
       84
       +
           maintainers = with maintainers; [

     

       85
       85
       +
             kuznero

     

       86
       86
       +
             jlesquembre

     

       87
       87
       +
             ngerstle

     

       88
       88
       +
             jk

     

       89
       89
       +
             ricochet

     

       90
       90
       +
           ];

     

       74
       91
        
           platforms = platforms.linux ++ platforms.darwin;

     

       75
       92
        
         };

     

       76
       93
        
       }

+92

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

···

       1
       1
       +
       {

     

       2
       2
       +
         fetchFromGitea,

     

       3
       3
       +
         fetchNpmDeps,

     

       4
       4
       +
         buildGoModule,

     

       5
       5
       +
         nodejs,

     

       6
       6
       +
         npmHooks,

     

       7
       7
       +
         lib,

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       let

     

       11
       11
       +
       

     

       12
       12
       +
         file-compose = buildGoModule {

     

       13
       13
       +
           pname = "file-compose";

     

       14
       14
       +
           version = "unstable-2023-10-21";

     

       15
       15
       +
       

     

       16
       16
       +
           src = fetchFromGitea {

     

       17
       17
       +
             domain = "codeberg.org";

     

       18
       18
       +
             owner = "readeck";

     

       19
       19
       +
             repo = "file-compose";

     

       20
       20
       +
             rev = "afa938655d412556a0db74b202f9bcc1c40d8579";

     

       21
       21
       +
             hash = "sha256-rMANRqUQRQ8ahlxuH1sWjlGpNvbReBOXIkmBim/wU2o=";

     

       22
       22
       +
           };

     

       23
       23
       +
       

     

       24
       24
       +
           vendorHash = "sha256-Qwixx3Evbf+53OFeS3Zr7QCkRMfgqc9hUA4eqEBaY0c=";

     

       25
       25
       +
         };

     

       26
       26
       +
       in

     

       27
       27
       +
       

     

       28
       28
       +
       buildGoModule rec {

     

       29
       29
       +
         pname = "readeck";

     

       30
       30
       +
         version = "0.17.1";

     

       31
       31
       +
       

     

       32
       32
       +
         src = fetchFromGitea {

     

       33
       33
       +
           domain = "codeberg.org";

     

       34
       34
       +
           owner = "readeck";

     

       35
       35
       +
           repo = "readeck";

     

       36
       36
       +
           tag = version;

     

       37
       37
       +
           hash = "sha256-+GgjR1mxD93bFNaLeDuEefPlQEV9jNgFIo8jTAxphyo=";

     

       38
       38
       +
         };

     

       39
       39
       +
       

     

       40
       40
       +
         nativeBuildInputs = [

     

       41
       41
       +
           nodejs

     

       42
       42
       +
           npmHooks.npmConfigHook

     

       43
       43
       +
         ];

     

       44
       44
       +
       

     

       45
       45
       +
         npmRoot = "web";

     

       46
       46
       +
       

     

       47
       47
       +
         NODE_PATH = "$npmDeps";

     

       48
       48
       +
       

     

       49
       49
       +
         preBuild = ''

     

       50
       50
       +
           make web-build

     

       51
       51
       +
           ${file-compose}/bin/file-compose -format json docs/api/api.yaml docs/assets/api.json

     

       52
       52
       +
           go run ./tools/docs docs/src docs/assets

     

       53
       53
       +
         '';

     

       54
       54
       +
       

     

       55
       55
       +
         tags = [

     

       56
       56
       +
           "netgo"

     

       57
       57
       +
           "osusergo"

     

       58
       58
       +
           "sqlite_omit_load_extension"

     

       59
       59
       +
           "sqlite_foreign_keys"

     

       60
       60
       +
           "sqlite_json1"

     

       61
       61
       +
           "sqlite_fts5"

     

       62
       62
       +
           "sqlite_secure_delete"

     

       63
       63
       +
         ];

     

       64
       64
       +
       

     

       65
       65
       +
         ldflags = [

     

       66
       66
       +
           "-X"

     

       67
       67
       +
           "codeberg.org/readeck/readeck/configs.version=${version}"

     

       68
       68
       +
         ];

     

       69
       69
       +
         overrideModAttrs = oldAttrs: {

     

       70
       70
       +
           # Do not add `npmConfigHook` to `goModules`

     

       71
       71
       +
           nativeBuildInputs = lib.remove npmHooks.npmConfigHook oldAttrs.nativeBuildInputs;

     

       72
       72
       +
           # Do not run `preBuild` when building `goModules`

     

       73
       73
       +
           preBuild = null;

     

       74
       74
       +
         };

     

       75
       75
       +
       

     

       76
       76
       +
         npmDeps = fetchNpmDeps {

     

       77
       77
       +
           src = "${src}/web";

     

       78
       78
       +
           hash = "sha256-7fRSkXKAMEC7rFmSF50DM66SVhV68g93PMBjrtkd9/E=";

     

       79
       79
       +
         };

     

       80
       80
       +
       

     

       81
       81
       +
         vendorHash = "sha256-O/ZrpT6wTtPwBDUCAmR0XHRgQmd46/MPvWNE0EvD3bg=";

     

       82
       82
       +
       

     

       83
       83
       +
         meta = {

     

       84
       84
       +
           description = "Web application that lets you save the readable content of web pages you want to keep forever.";

     

       85
       85
       +
           mainProgram = "readeck";

     

       86
       86
       +
           homepage = "https://readeck.org/";

     

       87
       87
       +
           changelog = "https://github.com/readeck/readeck/releases/tag/${version}";

     

       88
       88
       +
           license = lib.licenses.agpl3Only;

     

       89
       89
       +
           maintainers = with lib.maintainers; [ julienmalka ];

     

       90
       90
       +
         };

     

       91
       91
       +
       

     

       92
       92
       +
       }

+1 -1

pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix

···

       10
       10
        
       

     

       11
       11
        
         src = fetchurl {

     

       12
       12
        
           url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";

     

       13
       13
       -
           hash = "sha256-C5wzKhJcH2FJQJk5u2FGBrGDbezHBIIIUMkkVV6T8S4=";

     

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

     

       14
       14
        
         };

     

       15
       15
        
         sourceRoot = ".";

     

       16
       16

+5 -5

pkgs/by-name/sw/sway-easyfocus/package.nix

···

       15
       15
        
       

     

       16
       16
        
       rustPlatform.buildRustPackage rec {

     

       17
       17
        
         pname = "sway-easyfocus";

     

       18
       18
       -
         version = "unstable-2023-11-05";

     

       18
       18
       +
         version = "0.2.0";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "edzdez";

     

       22
       22
        
           repo = "sway-easyfocus";

     

       23
       23
       -
           rev = "4c70f6728dbfc859e60505f0a7fd82f5a90ed42c";

     

       24
       24
       -
           hash = "sha256-WvYXhf13ZCoa+JAF4bYgi5mI22i9pZLtbIhF1odqaTU=";

     

       23
       23
       +
           tag = version;

     

       24
       24
       +
           hash = "sha256-ogqstgJqUczn0LDwpOAppC1J/Cs0IEOAXjNAnbiKn6M=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
       -
         cargoHash = "sha256-9cN0ervcU8JojwG7J250fprbCD2rB9kh9TbRU+wCE/Y=";

     

       27
       27
       +
         cargoHash = "sha256-lAyKW6tjb4lVNA8xtvXLYYiLeKxSe/yfyY6h/f/WuP4=";

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [

     

       30
       30
        
           pkg-config

     
···

       45
       45
        
           description = "Tool to help efficiently focus windows in Sway, inspired by i3-easyfocus";

     

       46
       46
        
           homepage = "https://github.com/edzdez/sway-easyfocus";

     

       47
       47
        
           license = lib.licenses.mit;

     

       48
       48
       -
           maintainers = with lib.maintainers; [ ];

     

       48
       48
       +
           maintainers = with lib.maintainers; [ pjones ];

     

       49
       49
        
           mainProgram = "sway-easyfocus";

     

       50
       50
        
         };

     

       51
       51
        
       }

+1

pkgs/by-name/ta/tailscale/package.nix

···

       55
       55
        
           "cmd/derper"

     

       56
       56
        
           "cmd/derpprobe"

     

       57
       57
        
           "cmd/tailscaled"

     

       58
       58
       +
           "cmd/tsidp"

     

       58
       59
        
         ];

     

       59
       60
        
       

     

       60
       61
        
         ldflags = [

+11 -4

pkgs/by-name/we/weidu/package.nix

···

       6
       6
        
         ocaml-ng,

     

       7
       7
        
         perl,

     

       8
       8
        
         which,

     

       9
       9
       -
         gnumake42,

     

       9
       9
       +
         fetchpatch,

     

       10
       10
        
       }:

     

       11
       11
        
       

     

       12
       12
        
       let

     
···

       27
       27
        
           sha256 = "sha256-+vkKTzFZdAzY2dL+mZ4A0PDxhTKGgs9bfArz7S6b4m4=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
       +
         patches = [

     

       31
       31
       +
           (fetchpatch {

     

       32
       32
       +
             url = "https://github.com/WeiDUorg/weidu/commit/bb90190d8bf7d102952c07d8288a7dc6c7a3322e.patch";

     

       33
       33
       +
             hash = "sha256-Z4hHdMR1dYjJeERJSqlYynyPu2CvE6+XJuCr9ogDmvk=";

     

       34
       34
       +
           })

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       30
       37
        
         postPatch = ''

     

       31
       38
        
           substitute sample.Configuration Configuration \

     

       32
       39
        
             --replace /usr/bin ${lib.makeBinPath [ ocaml' ]} \

     

       40
       40
       +
             --replace /usr/local/bin ${lib.makeBinPath [ ocaml' ]} \

     

       33
       41
        
             --replace elkhound ${elkhound}/bin/elkhound

     

       34
       42
        
       

     

       35
       43
        
           mkdir -p obj/{.depend,x86_LINUX}

     
···

       43
       51
        
           ocaml'

     

       44
       52
        
           perl

     

       45
       53
        
           which

     

       46
       46
       -
           gnumake42

     

       47
       54
        
         ];

     

       48
       55
        
       

     

       49
       56
        
         buildFlags = [

     
···

       69
       76
        
           homepage = "https://weidu.org";

     

       70
       77
        
           license = licenses.gpl2Only;

     

       71
       78
        
           maintainers = with maintainers; [ peterhoeg ];

     

       72
       72
       -
           # should work fine on both Darwin and Windows

     

       73
       73
       -
           platforms = platforms.linux;

     

       79
       79
       +
           # should work fine on Windows

     

       80
       80
       +
           platforms = platforms.unix;

     

       74
       81
        
         };

     

       75
       82
        
       }

+2 -2

pkgs/by-name/yu/yutto/package.nix

···

       8
       8
        
       

     

       9
       9
        
       python3Packages.buildPythonApplication rec {

     

       10
       10
        
         pname = "yutto";

     

       11
       11
       -
         version = "2.0.0-rc.6";

     

       11
       11
       +
         version = "2.0.0-rc.7";

     

       12
       12
        
         pyproject = true;

     

       13
       13
        
       

     

       14
       14
        
         disabled = python3Packages.pythonOlder "3.9";

     
···

       18
       18
        
           owner = "yutto-dev";

     

       19
       19
        
           repo = "yutto";

     

       20
       20
        
           tag = "v${version}";

     

       21
       21
       -
           hash = "sha256-h7ziP3+qHUFs16MuUaUPZ7qspIFCIzExDyUEo12DJIE=";

     

       21
       21
       +
           hash = "sha256-yNAQmpR65FSCbciSSdO2eHUJcE6Dl8J4dqq6GHt5NDQ=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         build-system = with python3Packages; [ hatchling ];

+1 -1

pkgs/development/lisp-modules/packages.nix

···

       190
       190
        
           lispLibs = super.mathkit.lispLibs ++ [ super.sb-cga ];

     

       191
       191
        
         };

     

       192
       192
        
       

     

       193
       193
       -
         stumpwm = super.stumpwm.overrideAttrs {

     

       193
       193
       +
         stumpwm = super.stumpwm.overrideLispAttrs {

     

       194
       194
        
           inherit (pkgs.stumpwm) src version;

     

       195
       195
        
           meta = {

     

       196
       196
        
             inherit (pkgs.stumpwm.meta) description license homepage;

+45

pkgs/development/lua-modules/generated-packages.nix

···

       2907
       2907
        
         };

     

       2908
       2908
        
       }) {};

     

       2909
       2909
        
       

     

       2910
       2910
       +
       orgmode = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, tree-sitter-orgmode }:

     

       2911
       2911
       +
       buildLuarocksPackage {

     

       2912
       2912
       +
         pname = "orgmode";

     

       2913
       2913
       +
         version = "0.3.61-1";

     

       2914
       2914
       +
         knownRockspec = (fetchurl {

     

       2915
       2915
       +
           url    = "mirror://luarocks/orgmode-0.3.61-1.rockspec";

     

       2916
       2916
       +
           sha256 = "1sdmqaq3vzpb0c74n45piqrlcw3liiqlv282nrgr16jzsz1c870g";

     

       2917
       2917
       +
         }).outPath;

     

       2918
       2918
       +
         src = fetchzip {

     

       2919
       2919
       +
           url    = "https://github.com/nvim-orgmode/orgmode/archive/0.3.61.zip";

     

       2920
       2920
       +
           sha256 = "1gkpwyfvw9z92277q6311r924rmb9zidgmlr4xxkmn2xrj5qwl7x";

     

       2921
       2921
       +
         };

     

       2922
       2922
       +
       

     

       2923
       2923
       +
         disabled = luaOlder "5.1";

     

       2924
       2924
       +
         propagatedBuildInputs = [ tree-sitter-orgmode ];

     

       2925
       2925
       +
       

     

       2926
       2926
       +
         meta = {

     

       2927
       2927
       +
           homepage = "https://nvim-orgmode.github.io/";

     

       2928
       2928
       +
           description = "Orgmode clone written in Lua for Neovim 0.9+.";

     

       2929
       2929
       +
           license.fullName = "MIT";

     

       2930
       2930
       +
         };

     

       2931
       2931
       +
       }) {};

     

       2932
       2932
       +
       

     

       2910
       2933
        
       pathlib-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio }:

     

       2911
       2934
        
       buildLuarocksPackage {

     

       2912
       2935
        
         pname = "pathlib.nvim";

     
···

       3519
       3542
        
           homepage = "https://github.com/nvim-neorg/tree-sitter-norg";

     

       3520
       3543
        
           description = "The official tree-sitter parser for Norg documents.";

     

       3521
       3544
        
           maintainers = with lib.maintainers; [ mrcjkb ];

     

       3545
       3545
       +
           license.fullName = "MIT";

     

       3546
       3546
       +
         };

     

       3547
       3547
       +
       }) {};

     

       3548
       3548
       +
       

     

       3549
       3549
       +
       tree-sitter-orgmode = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luarocks-build-treesitter-parser }:

     

       3550
       3550
       +
       buildLuarocksPackage {

     

       3551
       3551
       +
         pname = "tree-sitter-orgmode";

     

       3552
       3552
       +
         version = "1.3.2-1";

     

       3553
       3553
       +
         knownRockspec = (fetchurl {

     

       3554
       3554
       +
           url    = "mirror://luarocks/tree-sitter-orgmode-1.3.2-1.rockspec";

     

       3555
       3555
       +
           sha256 = "1md45ic96yf3agay30w9icr9c1v5fs0p6zs4dd5d0clrsc9029c4";

     

       3556
       3556
       +
         }).outPath;

     

       3557
       3557
       +
         src = fetchzip {

     

       3558
       3558
       +
           url    = "https://github.com/nvim-orgmode/tree-sitter-org/archive/v1.3.2.zip";

     

       3559
       3559
       +
           sha256 = "1y1dyabvmm2q51nmi58lv0zf7sdz066i319s5j3ch6abcm1wv24i";

     

       3560
       3560
       +
         };

     

       3561
       3561
       +
       

     

       3562
       3562
       +
         nativeBuildInputs = [ luarocks-build-treesitter-parser ];

     

       3563
       3563
       +
       

     

       3564
       3564
       +
         meta = {

     

       3565
       3565
       +
           homepage = "https://github.com/nvim-orgmode/tree-sitter-org";

     

       3566
       3566
       +
           description = "A fork of tree-sitter-org, for use with the orgmode Neovim plugin";

     

       3522
       3567
        
           license.fullName = "MIT";

     

       3523
       3568
        
         };

     

       3524
       3569
        
       }) {};

+21 -3

pkgs/development/lua-modules/overrides.nix

···

       838
       838
        
           nativeBuildInputs = oa.nativeBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ];

     

       839
       839
        
         });

     

       840
       840
        
       

     

       841
       841
       +
         tl = prev.tl.overrideAttrs ({

     

       842
       842
       +
           preConfigure = ''

     

       843
       843
       +
             rm luarocks.lock

     

       844
       844
       +
           '';

     

       845
       845
       +
         });

     

       846
       846
       +
       

     

       841
       847
        
         toml-edit = prev.toml-edit.overrideAttrs (oa: {

     

       842
       848
        
       

     

       843
       849
        
           cargoDeps = rustPlatform.fetchCargoTarball {

     
···

       866
       872
        
           ];

     

       867
       873
        
         });

     

       868
       874
        
       

     

       869
       869
       -
         tl = prev.tl.overrideAttrs ({

     

       870
       870
       -
           preConfigure = ''

     

       871
       871
       -
             rm luarocks.lock

     

       875
       875
       +
         tree-sitter-orgmode = prev.tree-sitter-orgmode.overrideAttrs (oa: {

     

       876
       876
       +
           propagatedBuildInputs =

     

       877
       877
       +
             let

     

       878
       878
       +
               # HACK: luarocks-nix puts rockspec build dependencies in the nativeBuildInputs,

     

       879
       879
       +
               # but that doesn't seem to work

     

       880
       880
       +
               lua = lib.head oa.propagatedBuildInputs;

     

       881
       881
       +
             in

     

       882
       882
       +
             oa.propagatedBuildInputs

     

       883
       883
       +
             ++ [

     

       884
       884
       +
               lua.pkgs.luarocks-build-treesitter-parser

     

       885
       885
       +
               tree-sitter

     

       886
       886
       +
             ];

     

       887
       887
       +
       

     

       888
       888
       +
           preInstall = ''

     

       889
       889
       +
             export HOME="$TMPDIR";

     

       872
       890
        
           '';

     

       873
       891
        
         });

     

       874
       892

+2 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "aioraven";

     

       16
       16
       -
         version = "0.7.0";

     

       16
       16
       +
         version = "0.7.1";

     

       17
       17
        
         pyproject = true;

     

       18
       18
        
       

     

       19
       19
        
         disabled = pythonOlder "3.9";

     
···

       22
       22
        
           owner = "cottsay";

     

       23
       23
        
           repo = "aioraven";

     

       24
       24
        
           tag = version;

     

       25
       25
       -
           hash = "sha256-ux2jeXkh8YsJ6mItXOx40pp0Tc+aJXMV7ZqyZg+iy2c=";

     

       25
       25
       +
           hash = "sha256-rGqaDJtpdDWd8fxdfwU+rmgwEzZyYHfbiZxUlWoH2ks=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         build-system = [ setuptools ];

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "asteval";

     

       12
       12
       -
         version = "1.0.5";

     

       12
       12
       +
         version = "1.0.6";

     

       13
       13
        
         pyproject = true;

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.8";

     
···

       18
       18
        
           owner = "lmfit";

     

       19
       19
        
           repo = "asteval";

     

       20
       20
        
           tag = version;

     

       21
       21
       -
           hash = "sha256-PRmTbP3zRnkCxdeb45LBz5m/Ymoi4lq2poKuG9Esg9g=";

     

       21
       21
       +
           hash = "sha256-DzLVe8TlWAPQXzai9CJlDAow6UTSmkA/DW3fT30YfZY=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         postPatch = ''

+2 -2

pkgs/development/python-modules/ayla-iot-unofficial/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "ayla-iot-unofficial";

     

       15
       15
       -
         version = "1.4.4";

     

       15
       15
       +
         version = "1.4.5";

     

       16
       16
        
         pyproject = true;

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "rewardone";

     

       20
       20
        
           repo = "ayla-iot-unofficial";

     

       21
       21
        
           tag = "v${version}";

     

       22
       22
       -
           hash = "sha256-LYHfu02FYoL2D9dEL3CM3llRXMa2M3EMU9CAsl1Cgoo=";

     

       22
       22
       +
           hash = "sha256-FV3jes1cpvYbpCmJ+gdzBdsii1kyYe46R1NIpxiELBY=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         build-system = [ setuptools ];

+2 -2

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

···

       19
       19
        
       

     

       20
       20
        
       buildPythonPackage rec {

     

       21
       21
        
         pname = "cyclopts";

     

       22
       22
       -
         version = "3.2.1";

     

       22
       22
       +
         version = "3.3.0";

     

       23
       23
        
         pyproject = true;

     

       24
       24
        
       

     

       25
       25
        
         disabled = pythonOlder "3.8";

     
···

       28
       28
        
           owner = "BrianPugh";

     

       29
       29
        
           repo = "cyclopts";

     

       30
       30
        
           tag = "v${version}";

     

       31
       31
       -
           hash = "sha256-dHmoO9agZBhDviowtvuAox8hJsHcxgQTRxpaYmy50Dk=";

     

       31
       31
       +
           hash = "sha256-sXTKBDfQSqMWBX+wrhP6fCugGSuXM8mOkEroFWPalVs=";

     

       32
       32
        
         };

     

       33
       33
        
       

     

       34
       34
        
         build-system = [

+2 -2

pkgs/development/python-modules/kasa-crypt/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "kasa-crypt";

     

       14
       14
       -
         version = "0.4.4";

     

       14
       14
       +
         version = "0.5.0";

     

       15
       15
        
         pyproject = true;

     

       16
       16
        
       

     

       17
       17
        
         disabled = pythonOlder "3.7";

     
···

       20
       20
        
           owner = "bdraco";

     

       21
       21
        
           repo = "kasa-crypt";

     

       22
       22
        
           tag = "v${version}";

     

       23
       23
       -
           hash = "sha256-9uDloaf9w75O+7r27PK/xOf0TrK43ndxnTUcm4CmOXo=";

     

       23
       23
       +
           hash = "sha256-pkUB2RTCTZW9NhZlxBA9YC+8yWx+6yrNXk8OGAfGto4=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         postPatch = ''

+2 -2

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

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "mitogen";

     

       11
       11
       -
         version = "0.3.20";

     

       11
       11
       +
         version = "0.3.21";

     

       12
       12
        
         pyproject = true;

     

       13
       13
        
       

     

       14
       14
        
         disabled = pythonOlder "3.7";

     
···

       17
       17
        
           owner = "mitogen-hq";

     

       18
       18
        
           repo = "mitogen";

     

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

     

       20
       20
       -
           hash = "sha256-XA4ra06OHUV67HF093Mfi0M+Dd6K3gMnOYeOB663DhA=";

     

       20
       20
       +
           hash = "sha256-F8W15JHOuQ+MhQtQZz+zssgeZqFC+agqINnFaKP0lto=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         build-system = [ setuptools ];

+2 -2

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

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "python-overseerr";

     

       20
       20
       -
         version = "0.5.0";

     

       20
       20
       +
         version = "0.6.0";

     

       21
       21
        
         pyproject = true;

     

       22
       22
        
       

     

       23
       23
        
         disabled = pythonOlder "3.11";

     
···

       26
       26
        
           owner = "joostlek";

     

       27
       27
        
           repo = "python-overseerr";

     

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

     

       29
       29
       -
           hash = "sha256-MdJISHU/YbmQReT/Sf29jERUkuFASNCq4NQnk/BKK70=";

     

       29
       29
       +
           hash = "sha256-XkuHy8gF8z5t1AcdVdBYWHBgOpAM9jpO41IM7DB3Wt0=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         build-system = [ poetry-core ];

+7 -7

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

···

       26
       26
        
       

     

       27
       27
        
       buildPythonPackage rec {

     

       28
       28
        
         pname = "safety";

     

       29
       29
       -
         version = "3.12.13";

     

       29
       29
       +
         version = "3.2.14";

     

       30
       30
        
       

     

       31
       31
       -
         disabled = pythonOlder "3.7";

     

       31
       31
       +
         disabled = pythonOlder "3.8";

     

       32
       32
        
       

     

       33
       33
        
         pyproject = true;

     

       34
       34
        
       

     
···

       36
       36
        
           owner = "pyupio";

     

       37
       37
        
           repo = "safety";

     

       38
       38
        
           tag = version;

     

       39
       39
       -
           hash = "sha256-pE1J2hoV4glB1PisDrhCE/4m0J1gEHz/Tp/GJE83lBc=";

     

       39
       39
       +
           hash = "sha256-/RB+ota6dnlbJvtOOoIOHD+BjBzZIJRhEOAUQggUgB4=";

     

       40
       40
        
         };

     

       41
       41
        
       

     

       42
       42
        
         postPatch = ''

     
···

       54
       54
        
         build-system = [ setuptools ];

     

       55
       55
        
       

     

       56
       56
        
         pythonRelaxDeps = [

     

       57
       57
       -
           "filelock"

     

       57
       57
       +
           "pydantic"

     

       58
       58
        
         ];

     

       59
       59
        
       

     

       60
       60
        
         dependencies = [

     
···

       98
       98
        
           export HOME=$(mktemp -d)

     

       99
       99
        
         '';

     

       100
       100
        
       

     

       101
       101
       -
         meta = with lib; {

     

       101
       101
       +
         meta = {

     

       102
       102
        
           description = "Checks installed dependencies for known vulnerabilities";

     

       103
       103
        
           mainProgram = "safety";

     

       104
       104
        
           homepage = "https://github.com/pyupio/safety";

     

       105
       105
        
           changelog = "https://github.com/pyupio/safety/blob/${version}/CHANGELOG.md";

     

       106
       106
       -
           license = licenses.mit;

     

       107
       107
       -
           maintainers = with maintainers; [

     

       106
       106
       +
           license = lib.licenses.mit;

     

       107
       107
       +
           maintainers = with lib.maintainers; [

     

       108
       108
        
             thomasdesr

     

       109
       109
        
             dotlambda

     

       110
       110
        
           ];

+2 -2

pkgs/development/python-modules/thermopro-ble/default.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "thermopro-ble";

     

       16
       16
       -
         version = "0.10.0";

     

       16
       16
       +
         version = "0.10.1";

     

       17
       17
        
         pyproject = true;

     

       18
       18
        
       

     

       19
       19
        
         disabled = pythonOlder "3.9";

     
···

       22
       22
        
           owner = "bluetooth-devices";

     

       23
       23
        
           repo = "thermopro-ble";

     

       24
       24
        
           tag = "v${version}";

     

       25
       25
       -
           hash = "sha256-xaRbp9XLCDGJ0NE0TzJygn2OzqvSFszs97vGHawCkzU=";

     

       25
       25
       +
           hash = "sha256-OGUgWiD/4a2A40wut70YAvwBREpB9xjN0YcFpu411z4=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         build-system = [ poetry-core ];