commit 4d19b247888f0400d8bf7c35e1ea57065bd038f4 · pyrox.dev/nixpkgs

+3

doc/languages-frameworks/python.section.md

···

2117
2117

2118
2118

We recommend [nix-init](https://github.com/nix-community/nix-init) for creating new python packages within nixpkgs,

2119
2119

as it already prefetches the source, parses dependencies for common formats and prefills most things in `meta`.

2120
2120
+
When using the tool, pull from the original source repository instead of PyPI, if possible.

2120
2121

2121
2122

See also [contributing section](#contributing).

2122
2123

···

2190
2191

that characters should be converted to lowercase and `.` and `_` should be

2191
2192

replaced by a single `-` (foo-bar-baz instead of Foo__Bar.baz).

2192
2193

If necessary, `pname` has to be given a different value within `fetchPypi`.

2194
2194
+
* It's generally preferable to fetch `src` directly from the repo and not from

2195
2195
+
PyPI. Use `fetchPypi` when there's a clear technical reason to do so.

2193
2196

* Packages from sources such as GitHub and GitLab that do not exist on PyPI

2194
2197

should not use a name that is already used on PyPI. When possible, they should

2195
2198

use the package repository name prefixed with the owner (e.g. organization) name

+6 -6

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

···

       58
       58
        
               // lib.optionalAttrs (cfg.database.type == "postgresql") {

     

       59
       59
        
                 withPostgreSQL = true;

     

       60
       60
        
               }

     

       61
       61
       -
               // lib.optionalAttrs (cfg.database.type == "mysql") {

     

       61
       61
       +
               // lib.optionalAttrs (cfg.database.type == "mariadb") {

     

       62
       62
        
                 withMySQL = true;

     

       63
       63
        
               }

     

       64
       64
        
             );

     
···

       168
       168
        
         dbService =

     

       169
       169
        
           {

     

       170
       170
        
             "postgresql" = "postgresql.service";

     

       171
       171
       -
             "mysql" = "mysql.service";

     

       171
       171
       +
             "mariadb" = "mysql.service";

     

       172
       172
        
           }

     

       173
       173
        
           .${cfg.database.type};

     

       174
       174
        
       

     
···

       475
       475
        
             database = {

     

       476
       476
        
               type = mkOption {

     

       477
       477
        
                 type = types.enum [

     

       478
       478
       -
                   "mysql"

     

       478
       478
       +
                   "mariadb"

     

       479
       479
        
                   "postgresql"

     

       480
       480
        
                 ];

     

       481
       481
       -
                 example = "mysql";

     

       481
       481
       +
                 example = "mariadb";

     

       482
       482
        
                 default = "postgresql";

     

       483
       483
        
                 description = "Database engine to use.";

     

       484
       484
        
               };

     
···

       621
       621
        
                   DB_DRIVER =

     

       622
       622
        
                     {

     

       623
       623
        
                       "postgresql" = "pgsql";

     

       624
       624
       -
                       "mysql" = "mysql";

     

       624
       624
       +
                       "mariadb" = "mysql";

     

       625
       625
        
                     }

     

       626
       626
        
                     .${cfg.database.type};

     

       627
       627
        
                   DB_HOST = "localhost";

     
···

       791
       791
        
               }

     

       792
       792
        
             );

     

       793
       793
        
       

     

       794
       794
       -
             mysql = mkIf (cfg.database.createLocally && cfg.database.type == "mysql") {

     

       794
       794
       +
             mysql = mkIf (cfg.database.createLocally && cfg.database.type == "mariadb") {

     

       795
       795
        
               enable = mkDefault true;

     

       796
       796
        
               package = mkDefault pkgs.mariadb;

     

       797
       797
        
               ensureDatabases = [ cfg.database.name ];

+2 -2

pkgs/by-name/gh/gh-gei/package.nix

···

       7
       7
        
       

     

       8
       8
        
       buildDotnetModule rec {

     

       9
       9
        
         pname = "gh-gei";

     

       10
       10
       -
         version = "1.14.0";

     

       10
       10
       +
         version = "1.15.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "github";

     

       14
       14
        
           repo = "gh-gei";

     

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

     

       16
       16
       -
           hash = "sha256-Kjva6E0P+O1+R9EFNYQWt0Tte/DFaCActmJU58+6G6I=";

     

       16
       16
       +
           hash = "sha256-33Npwf4C6IFrrsIRq4+udphfovaCXQ8JfN0yzfxIRq0=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx;

+5 -5

pkgs/by-name/mo/movim/package.nix

···

       6
       6
        
         php,

     

       7
       7
        
         phpCfg ? null,

     

       8
       8
        
         withPostgreSQL ? true, # “strongly recommended” according to docs

     

       9
       9
       -
         withMySQL ? false,

     

       9
       9
       +
         withMariaDB ? false,

     

       10
       10
        
         minifyStaticFiles ? false, # default files are often not minified

     

       11
       11
        
         esbuild,

     

       12
       12
        
         lightningcss,

     
···

       44
       44
        
       in

     

       45
       45
        
       php.buildComposerProject2 (finalAttrs: {

     

       46
       46
        
         pname = "movim";

     

       47
       47
       -
         version = "0.30";

     

       47
       47
       +
         version = "0.30.1";

     

       48
       48
        
       

     

       49
       49
        
         src = fetchFromGitHub {

     

       50
       50
        
           owner = "movim";

     

       51
       51
        
           repo = "movim";

     

       52
       52
        
           tag = "v${finalAttrs.version}";

     

       53
       53
       -
           hash = "sha256-rW751UhDBhakOrAT4BOiRDPpGldf1EwNZY8iavXlpLk=";

     

       53
       53
       +
           hash = "sha256-MjP1rLyWJWrUAHrOKAwGN3A0wIq4iPaXlaUbtPs3F6U=";

     

       54
       54
        
         };

     

       55
       55
        
       

     

       56
       56
        
         php = php.buildEnv (

     
···

       71
       71
        
                 all.pdo_pgsql

     

       72
       72
        
                 all.pgsql

     

       73
       73
        
               ]

     

       74
       74
       -
               ++ lib.optionals withMySQL [

     

       74
       74
       +
               ++ lib.optionals withMariaDB [

     

       75
       75
        
                 all.mysqli

     

       76
       76
        
                 all.mysqlnd

     

       77
       77
        
                 all.pdo_mysql

     
···

       88
       88
        
           ++ lib.optional minify.style.enable lightningcss

     

       89
       89
        
           ++ lib.optional minify.svg.enable scour;

     

       90
       90
        
       

     

       91
       91
       -
         vendorHash = "sha256-NuX6CX2QXea8BcL0nzFOdxIBs36igD8lvixna+vsviM=";

     

       91
       91
       +
         vendorHash = "sha256-7jb4/UgnMcXtLCihwk4rr0HLw99FgiYeYJVATGxM/D4=";

     

       92
       92
        
       

     

       93
       93
        
         postPatch = ''

     

       94
       94
        
           # Our modules are already wrapped, removes missing *.so warnings;

+3 -3

pkgs/by-name/sv/svix-server/package.nix

···

       10
       10
        
       

     

       11
       11
        
       rustPlatform.buildRustPackage rec {

     

       12
       12
        
         pname = "svix-server";

     

       13
       13
       -
         version = "1.64.1";

     

       13
       13
       +
         version = "1.65.0";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "svix";

     

       17
       17
        
           repo = "svix-webhooks";

     

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

     

       19
       19
       -
           hash = "sha256-ZaSUTGv/l54tKvXd2hUeQYKTUmQOUm2dpZE7J8auWb0=";

     

       19
       19
       +
           hash = "sha256-SmNiQeVoTASMW6T5mcInZLlNok32olWRr2+daq/c684=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         sourceRoot = "${src.name}/server";

     

       23
       23
        
       

     

       24
       24
        
         useFetchCargoVendor = true;

     

       25
       25
       -
         cargoHash = "sha256-h19xpILPudOMSC99wBB1CA/981eK+FHgsGJAJOFPeuw=";

     

       25
       25
       +
         cargoHash = "sha256-vpPWEYVKEboubbWeuxyXz/M53Ura8gSpuneH/L7Qtmw=";

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [ pkg-config ];

     

       28
       28

+52

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

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildPythonPackage,

     

       4
       4
       +
         fetchFromGitea,

     

       5
       5
       +
         flit-core,

     

       6
       6
       +
         pytestCheckHook,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         version = "0.8.0";

     

       11
       11
       +
         pname = "pylit";

     

       12
       12
       +
         pyproject = true;

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitea {

     

       15
       15
       +
           domain = "codeberg.org";

     

       16
       16
       +
           owner = "milde";

     

       17
       17
       +
           repo = "pylit";

     

       18
       18
       +
           tag = version;

     

       19
       19
       +
           hash = "sha256-wr2Gz5DCeCVULe9k/DHd+Jhbfc4q4wSoJrcWaJUvWWw=";

     

       20
       20
       +
           # fix hash mismatch on linux/darwin platforms

     

       21
       21
       +
           postFetch = ''

     

       22
       22
       +
             rm -f $out/doc/logo/py{L,l}it-bold-framed.svg

     

       23
       23
       +
           '';

     

       24
       24
       +
         };

     

       25
       25
       +
       

     

       26
       26
       +
         # replace legacy nose module with pytest

     

       27
       27
       +
         postPatch = ''

     

       28
       28
       +
           substituteInPlace test/{pylit,pylit_ui}_test.py \

     

       29
       29
       +
             --replace-fail "import nose" "import pytest" \

     

       30
       30
       +
             --replace-fail "nose.runmodule()" "pytest.main()"

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         build-system = [

     

       34
       34
       +
           flit-core

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       37
       37
       +
         pythonImportsCheck = [ "pylit" ];

     

       38
       38
       +
       

     

       39
       39
       +
         nativeCheckInputs = [

     

       40
       40
       +
           pytestCheckHook

     

       41
       41
       +
         ];

     

       42
       42
       +
       

     

       43
       43
       +
         pytestFlagsArray = [ "test" ];

     

       44
       44
       +
       

     

       45
       45
       +
         meta = {

     

       46
       46
       +
           homepage = "https://codeberg.org/milde/pylit";

     

       47
       47
       +
           description = "Bidirectional text/code converter";

     

       48
       48
       +
           mainProgram = "pylit";

     

       49
       49
       +
           license = lib.licenses.gpl3Plus;

     

       50
       50
       +
           maintainers = with lib.maintainers; [ qbisi ];

     

       51
       51
       +
         };

     

       52
       52
       +
       }

+2

pkgs/top-level/python-packages.nix

···

       12671
       12671
        
       

     

       12672
       12672
        
         pylion = callPackage ../development/python-modules/pylion { };

     

       12673
       12673
        
       

     

       12674
       12674
       +
         pylit = callPackage ../development/python-modules/pylit { };

     

       12675
       12675
       +
       

     

       12674
       12676
        
         pylitejet = callPackage ../development/python-modules/pylitejet { };

     

       12675
       12677
        
       

     

       12676
       12678
        
         pylitterbot = callPackage ../development/python-modules/pylitterbot { };