commit 668adff0d461761b91d24f755dcd0b52ec83cd5a · pyrox.dev/nixpkgs

+1 -1

nixos/doc/manual/development/running-nixos-tests-interactively.section.md

···

       44
       44
        
       starting a TCP server in a terminal using the command:

     

       45
       45
        
       

     

       46
       46
        
       ```ShellSession

     

       47
       47
       -
       $ socat 'READLINE,PROMPT=$ ' tcp-listen:4444,reuseaddr`

     

       47
       47
       +
       $ socat 'READLINE,PROMPT=$ ' tcp-listen:4444,reuseaddr

     

       48
       48
        
       ```

     

       49
       49
        
       

     

       50
       50
        
       In the terminal where the test driver is running, connect to this server by

+1 -1

nixos/modules/services/monitoring/zabbix-proxy.nix

···

       103
       103
        
       

     

       104
       104
        
               port = mkOption {

     

       105
       105
        
                 type = types.port;

     

       106
       106
       -
                 default = if cfg.database.type == "mysql" then mysql.port else pgsql.services.port;

     

       106
       106
       +
                 default = if cfg.database.type == "mysql" then mysql.port else pgsql.settings.port;

     

       107
       107
        
                 defaultText = literalExpression ''

     

       108
       108
        
                   if config.${opt.database.type} == "mysql"

     

       109
       109
        
                   then config.${options.services.mysql.port}

+1 -3

nixos/tests/ladybird.nix

···

       10
       10
        
           ];

     

       11
       11
        
       

     

       12
       12
        
           services.xserver.enable = true;

     

       13
       13
       -
           environment.systemPackages = [

     

       14
       14
       -
             pkgs.ladybird

     

       15
       15
       -
           ];

     

       13
       13
       +
           programs.ladybird.enable = true;

     

       16
       14
        
         };

     

       17
       15
        
       

     

       18
       16
        
         enableOCR = true;

+7 -3

pkgs/applications/editors/vim/default.nix

···

       26
       26
        
         configureFlags = [

     

       27
       27
        
           "--enable-multibyte"

     

       28
       28
        
           "--enable-nls"

     

       29
       29
       -
         ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       29
       29
       +
         ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) ([

     

       30
       30
        
           "vim_cv_toupper_broken=no"

     

       31
       31
        
           "--with-tlib=ncurses"

     

       32
       32
        
           "vim_cv_terminfo=yes"

     

       33
       33
        
           "vim_cv_tgetent=zero" # it does on native anyway

     

       34
       34
       -
           "vim_cv_timer_create=yes"

     

       35
       34
        
           "vim_cv_tty_group=tty"

     

       36
       35
        
           "vim_cv_tty_mode=0660"

     

       37
       36
        
           "vim_cv_getcwd_broken=no"

     

       38
       37
        
           "vim_cv_stat_ignores_slash=yes"

     

       39
       38
        
           "vim_cv_memmove_handles_overlap=yes"

     

       40
       40
       -
         ];

     

       39
       39
       +
         ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [

     

       40
       40
       +
           "vim_cv_timer_create=no"

     

       41
       41
       +
           "vim_cv_timer_create_with_lrt=yes"

     

       42
       42
       +
         ] ++ lib.optionals (!stdenv.hostPlatform.isFreeBSD) [

     

       43
       43
       +
           "vim_cv_timer_create=yes"

     

       44
       44
       +
         ]);

     

       41
       45
        
       

     

       42
       46
        
         # which.sh is used to for vim's own shebang patching, so make it find

     

       43
       47
        
         # binaries for the host platform.

+4 -4

pkgs/applications/editors/vscode/extensions/default.nix

···

       1820
       1820
        
               mktplcRef = {

     

       1821
       1821
        
                 publisher = "github";

     

       1822
       1822
        
                 name = "copilot";

     

       1823
       1823
       -
                 version = "1.180.827";

     

       1824
       1824
       -
                 hash = "sha256-HA1na9FoExIiAay+tEjxWKqpG2+wq4Oww77Gl2Bhciw=";

     

       1823
       1823
       +
                 version = "1.200.920";

     

       1824
       1824
       +
                 hash = "sha256-LMShW9GN/wsDBodVn33Ui4qW0619r13VO2rSTPVE9TQ=";

     

       1825
       1825
        
               };

     

       1826
       1826
        
       

     

       1827
       1827
        
               meta = {

     
···

       1837
       1837
        
               mktplcRef = {

     

       1838
       1838
        
                 publisher = "github";

     

       1839
       1839
        
                 name = "copilot-chat";

     

       1840
       1840
       -
                 version = "0.14.2024032901"; # compatible with vscode 1.88.1

     

       1841
       1841
       -
                 hash = "sha256-+6N7IGO5j0wP5Zg8CwapHeKGWiZzc43VM4jCtqJDJIQ=";

     

       1840
       1840
       +
                 version = "0.16.2024060502"; # compatible with vscode 1.90.0

     

       1841
       1841
       +
                 hash = "sha256-SAydDc3JlJzfCtbJICy3rWx8psVPdRdPfOuzR9Dqtp8=";

     

       1842
       1842
        
               };

     

       1843
       1843
        
               meta = {

     

       1844
       1844
        
                 description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features";

+9 -11

pkgs/applications/networking/browsers/ladybird/default.nix

···

       50
       50
        
       in

     

       51
       51
        
       stdenv.mkDerivation (finalAttrs: {

     

       52
       52
        
         pname = "ladybird";

     

       53
       53
       -
         version = "0-unstable-2024-05-26";

     

       53
       53
       +
         version = "0-unstable-2024-06-04";

     

       54
       54
        
       

     

       55
       55
        
         src = fetchFromGitHub {

     

       56
       56
       -
           owner = "SerenityOS";

     

       57
       57
       -
           repo = "serenity";

     

       58
       58
       -
           rev = "1a9d8e8fbe360f2d3b376ca0e13c507bd2cc6e8b";

     

       59
       59
       -
           hash = "sha256-+g/1F/v8nTVbvtSrtyvQbeYacjTlfRpg+Htu0lRlkcU=";

     

       56
       56
       +
           owner = "LadybirdWebBrowser";

     

       57
       57
       +
           repo = "ladybird";

     

       58
       58
       +
           rev = "c6e9f0e7b5b050ddbb5d735ca9c65458add9b4a5";

     

       59
       59
       +
           hash = "sha256-+NDrd0kO9bqXFcCEJFmNwNu5jmf+wT+uUVlmbmCYLw4=";

     

       60
       60
        
         };

     

       61
       61
        
       

     

       62
       62
        
         patches = [

     
···

       64
       64
        
         ];

     

       65
       65
        
       

     

       66
       66
        
         postPatch = ''

     

       67
       67
       -
           sed -i '/iconutil/d' CMakeLists.txt

     

       67
       67
       +
           sed -i '/iconutil/d' Ladybird/CMakeLists.txt

     

       68
       68
        
       

     

       69
       69
        
           # Don't set absolute paths in RPATH

     

       70
       70
        
           substituteInPlace Meta/CMake/lagom_install_options.cmake \

     
···

       73
       73
        
         '';

     

       74
       74
        
       

     

       75
       75
        
         preConfigure = ''

     

       76
       76
       -
           cd Ladybird

     

       77
       77
       -
       

     

       78
       76
        
           # Setup caches for LibLocale, LibUnicode, LibTimezone, LibTLS and LibGfx

     

       79
       77
        
           # Note that the versions of the input data packages must match the

     

       80
       78
        
           # expected version in the package's CMake.

     

       81
       79
        
       

     

       82
       80
        
           # Check that the versions match

     

       83
       83
       -
           grep -F 'set(CLDR_VERSION "${cldr_version}")' ../Meta/CMake/locale_data.cmake || (echo cldr_version mismatch && exit 1)

     

       84
       84
       -
           grep -F 'set(TZDB_VERSION "${tzdata.version}")' ../Meta/CMake/time_zone_data.cmake || (echo tzdata.version mismatch && exit 1)

     

       85
       85
       -
           grep -F 'set(CACERT_VERSION "${cacert_version}")' ../Meta/CMake/ca_certificates_data.cmake || (echo cacert_version mismatch && exit 1)

     

       81
       81
       +
           grep -F 'set(CLDR_VERSION "${cldr_version}")' Meta/CMake/locale_data.cmake || (echo cldr_version mismatch && exit 1)

     

       82
       82
       +
           grep -F 'set(TZDB_VERSION "${tzdata.version}")' Meta/CMake/time_zone_data.cmake || (echo tzdata.version mismatch && exit 1)

     

       83
       83
       +
           grep -F 'set(CACERT_VERSION "${cacert_version}")' Meta/CMake/ca_certificates_data.cmake || (echo cacert_version mismatch && exit 1)

     

       86
       84
        
       

     

       87
       85
        
           mkdir -p build/Caches

     

       88
       86

+2 -2

pkgs/applications/science/medicine/xmedcon/default.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "xmedcon";

     

       14
       14
       -
         version = "0.23.0";

     

       14
       14
       +
         version = "0.24.0";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";

     

       18
       18
       -
           sha256 = "sha256-g1CRJDokLDzB+1YIuVQNByBLx01CI47EwGeluqVDujk=";

     

       18
       18
       +
           sha256 = "sha256-9NAAXGEVgpVPS7MB8FubnYUpkihE3lET/gep8QfPhB0=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         buildInputs = [

+2 -1

pkgs/applications/version-management/git/default.nix

···

       121
       121
        
         # acceptable version.

     

       122
       122
        
         #

     

       123
       123
        
         # See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706

     

       124
       124
       -
         ++ lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent";

     

       124
       124
       +
         ++ lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent"

     

       125
       125
       +
         ++ lib.optional (stdenv.hostPlatform.isFreeBSD && stdenv.hostPlatform != stdenv.buildPlatform) "uname_S=FreeBSD";

     

       125
       126
        
       

     

       126
       127
        
         disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

     

       127
       128
        
           stdenv.shellPackage

+3 -3

pkgs/by-name/hu/hugo/package.nix

···

       10
       10
        
       

     

       11
       11
        
       buildGoModule rec {

     

       12
       12
        
         pname = "hugo";

     

       13
       13
       -
         version = "0.126.3";

     

       13
       13
       +
         version = "0.127.0";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "gohugoio";

     

       17
       17
        
           repo = "hugo";

     

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

     

       19
       19
       -
           hash = "sha256-WWpcbY8KA/62AeIt1hH+xfgEoPle4hfH+/K7I+1xdEc=";

     

       19
       19
       +
           hash = "sha256-QAZP119VOPTnVXe2mtzCpB3OW/g73oA/qwR94OzISKo=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         vendorHash = "sha256-VfwiA5LCAJ1pkmMCy/Dcc5bLKkNY1MHtxHcHvKLoWHs=";

     

       22
       22
       +
         vendorHash = "sha256-Og7FTCrto1l+Xpfr2zEgg/yXa7dflws0yJ2Xh9f3mbI=";

     

       23
       23
        
       

     

       24
       24
        
         doCheck = false;

     

       25
       25

+2 -2

pkgs/by-name/ja/jazz2/package.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation (finalAttrs: {

     

       15
       15
        
         pname = "jazz2";

     

       16
       16
       -
         version = "2.6.0";

     

       16
       16
       +
         version = "2.7.0";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "deathkiller";

     

       20
       20
        
           repo = "jazz2-native";

     

       21
       21
        
           rev = finalAttrs.version;

     

       22
       22
       -
           hash = "sha256-ZTQz6+2myUIJr2HqiwYksM7qiwXrd4+3+h1TC6FuPFU=";

     

       22
       22
       +
           hash = "sha256-iy5b5h6wpOlubtOwBs0X7P0wBD3QeAQwjMhgnd4YP+Q=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         patches = [ ./nocontent.patch ];

+43 -34

pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix

···

       1
       1
       -
       { stdenv

     

       2
       2
       -
       , config

     

       3
       3
       -
       , pkgs

     

       4
       4
       -
       , lib

     

       5
       5
       -
       , fetchFromGitHub

     

       6
       6
       -
       , cmake

     

       7
       7
       -
       , eigen

     

       8
       8
       -
       , onnxruntime

     

       9
       9
       -
       , opencv

     

       10
       10
       -
       , cudaSupport ? config.cudaSupport

     

       11
       11
       -
       , cudaPackages ? { }

     

       1
       1
       +
       {

     

       2
       2
       +
         stdenv,

     

       3
       3
       +
         config,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         lib,

     

       6
       6
       +
         fetchFromGitHub,

     

       7
       7
       +
         cmake,

     

       8
       8
       +
         eigen,

     

       9
       9
       +
         onnxruntime,

     

       10
       10
       +
         opencv,

     

       11
       11
       +
         cudaSupport ? config.cudaSupport,

     

       12
       12
       +
         cudaPackages ? { },

     

       12
       13
        
       }@inputs:

     

       13
       14
        
       

     

       14
       15
        
       let

     
···

       30
       31
        
           hash = "sha256-5TItnPDc5WShpZAgBYeqgI9KKkk3qw/M8HPMlq/H4BM=";

     

       31
       32
        
         };

     

       32
       33
        
       

     

       33
       33
       -
         outputs = [ "out" "cmake" ];

     

       34
       34
       +
         outputs = [

     

       35
       35
       +
           "out"

     

       36
       36
       +
           "cmake"

     

       37
       37
       +
         ];

     

       34
       38
        
       

     

       35
       39
        
         nativeBuildInputs = [

     

       36
       40
        
           cmake

     

       37
       41
        
           eigen

     

       38
       38
       -
         ] ++ lib.optionals cudaSupport [

     

       39
       39
       -
           cudaPackages.cuda_nvcc

     

       40
       40
       -
         ];

     

       42
       42
       +
         ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];

     

       41
       43
        
       

     

       42
       42
       -
         buildInputs = [

     

       43
       43
       -
           onnxruntime

     

       44
       44
       -
           opencv

     

       45
       45
       -
         ] ++ lib.optionals cudaSupport (with cudaPackages; [

     

       46
       46
       -
           cuda_cccl # cub/cub.cuh

     

       47
       47
       -
           libcublas # cublas_v2.h

     

       48
       48
       -
           libcurand # curand.h

     

       49
       49
       -
           libcusparse # cusparse.h

     

       50
       50
       -
           libcufft # cufft.h

     

       51
       51
       -
           cudnn # cudnn.h

     

       52
       52
       -
           cuda_cudart

     

       53
       53
       -
         ]);

     

       44
       44
       +
         buildInputs =

     

       45
       45
       +
           [

     

       46
       46
       +
             onnxruntime

     

       47
       47
       +
             opencv

     

       48
       48
       +
           ]

     

       49
       49
       +
           ++ lib.optionals cudaSupport (

     

       50
       50
       +
             with cudaPackages;

     

       51
       51
       +
             [

     

       52
       52
       +
               cuda_cccl # cub/cub.cuh

     

       53
       53
       +
               libcublas # cublas_v2.h

     

       54
       54
       +
               libcurand # curand.h

     

       55
       55
       +
               libcusparse # cusparse.h

     

       56
       56
       +
               libcufft # cufft.h

     

       57
       57
       +
               cudnn # cudnn.h

     

       58
       58
       +
               cuda_cudart

     

       59
       59
       +
             ]

     

       60
       60
       +
           );

     

       54
       61
        
       

     

       55
       55
       -
         cmakeFlags = [

     

       56
       56
       -
           (lib.cmakeFeature "CMAKE_BUILD_TYPE" "None")

     

       57
       57
       -
           (lib.cmakeBool "BUILD_SHARED_LIBS" true)

     

       58
       58
       -
         ] ++ lib.optionals cudaSupport [

     

       59
       59
       -
           (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString)

     

       60
       60
       -
         ];

     

       62
       62
       +
         cmakeFlags =

     

       63
       63
       +
           [

     

       64
       64
       +
             (lib.cmakeFeature "CMAKE_BUILD_TYPE" "None")

     

       65
       65
       +
             (lib.cmakeBool "BUILD_SHARED_LIBS" true)

     

       66
       66
       +
           ]

     

       67
       67
       +
           ++ lib.optionals cudaSupport [

     

       68
       68
       +
             (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString)

     

       69
       69
       +
           ];

     

       61
       70
        
       

     

       62
       71
        
         postInstall = ''

     

       63
       72
        
           mkdir $cmake

     
···

       67
       76
        
         meta = with lib; {

     

       68
       77
        
           description = "MaaAssistantArknights stripped-down version of FastDeploy";

     

       69
       78
        
           homepage = "https://github.com/MaaAssistantArknights/FastDeploy";

     

       70
       70
       -
           platforms = platforms.linux;

     

       79
       79
       +
           platforms = platforms.linux ++ platforms.darwin;

     

       71
       80
        
           license = licenses.asl20;

     

       72
       81
        
           broken = cudaSupport && stdenv.hostPlatform.system != "x86_64-linux";

     

       73
       82
        
         };

+42 -33

pkgs/by-name/ma/maa-assistant-arknights/package.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , config

     

       3
       3
       -
       , callPackage

     

       4
       4
       -
       , stdenv

     

       5
       5
       -
       , fetchFromGitHub

     

       6
       6
       -
       , asio

     

       7
       7
       -
       , cmake

     

       8
       8
       -
       , eigen

     

       9
       9
       -
       , libcpr

     

       10
       10
       -
       , onnxruntime

     

       11
       11
       -
       , opencv

     

       12
       12
       -
       , isBeta ? false

     

       13
       13
       -
       , cudaSupport ? config.cudaSupport

     

       14
       14
       -
       , cudaPackages ? { }

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         config,

     

       4
       4
       +
         callPackage,

     

       5
       5
       +
         stdenv,

     

       6
       6
       +
         overrideSDK,

     

       7
       7
       +
         fetchFromGitHub,

     

       8
       8
       +
         asio,

     

       9
       9
       +
         cmake,

     

       10
       10
       +
         libcpr,

     

       11
       11
       +
         onnxruntime,

     

       12
       12
       +
         opencv,

     

       13
       13
       +
         isBeta ? false,

     

       14
       14
       +
         cudaSupport ? config.cudaSupport,

     

       15
       15
       +
         cudaPackages ? { },

     

       15
       16
        
       }:

     

       16
       17
        
       

     

       17
       18
        
       let

     

       18
       19
        
         fastdeploy = callPackage ./fastdeploy-ppocr.nix { };

     

       19
       20
        
         sources = lib.importJSON ./pin.json;

     

       20
       21
        
       in

     

       21
       21
       -
       stdenv.mkDerivation (finalAttr: {

     

       22
       22
       +
       # https://github.com/NixOS/nixpkgs/issues/314160

     

       23
       23
       +
       (if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv).mkDerivation (finalAttr: {

     

       22
       24
        
         pname = "maa-assistant-arknights" + lib.optionalString isBeta "-beta";

     

       23
       25
        
         version = if isBeta then sources.beta.version else sources.stable.version;

     

       24
       26
        
       

     
···

       33
       35
        
           asio

     

       34
       36
        
           cmake

     

       35
       37
        
           fastdeploy.cmake

     

       36
       36
       -
         ] ++ lib.optionals cudaSupport [

     

       37
       37
       -
           cudaPackages.cuda_nvcc

     

       38
       38
       -
         ];

     

       38
       38
       +
         ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];

     

       39
       39
        
       

     

       40
       40
       -
         buildInputs = [

     

       41
       41
       -
           fastdeploy

     

       42
       42
       -
           libcpr

     

       43
       43
       -
           onnxruntime

     

       44
       44
       -
           opencv

     

       45
       45
       -
         ] ++ lib.optionals cudaSupport (with cudaPackages; [

     

       46
       46
       -
           cuda_cccl # cub/cub.cuh

     

       47
       47
       -
           libcublas # cublas_v2.h

     

       48
       48
       -
           libcurand # curand.h

     

       49
       49
       -
           libcusparse # cusparse.h

     

       50
       50
       -
           libcufft # cufft.h

     

       51
       51
       -
           cudnn # cudnn.h

     

       52
       52
       -
           cuda_cudart

     

       53
       53
       -
         ]);

     

       40
       40
       +
         buildInputs =

     

       41
       41
       +
           [

     

       42
       42
       +
             fastdeploy

     

       43
       43
       +
             libcpr

     

       44
       44
       +
             onnxruntime

     

       45
       45
       +
             opencv

     

       46
       46
       +
           ]

     

       47
       47
       +
           ++ lib.optionals cudaSupport (

     

       48
       48
       +
             with cudaPackages;

     

       49
       49
       +
             [

     

       50
       50
       +
               cuda_cccl # cub/cub.cuh

     

       51
       51
       +
               libcublas # cublas_v2.h

     

       52
       52
       +
               libcurand # curand.h

     

       53
       53
       +
               libcusparse # cusparse.h

     

       54
       54
       +
               libcufft # cufft.h

     

       55
       55
       +
               cudnn # cudnn.h

     

       56
       56
       +
               cuda_cudart

     

       57
       57
       +
             ]

     

       58
       58
       +
           );

     

       54
       59
        
       

     

       55
       60
        
         cmakeFlags = [

     

       56
       61
        
           (lib.cmakeBool "BUILD_SHARED_LIBS" true)

     
···

       64
       69
        
       

     

       65
       70
        
         passthru.updateScript = ./update.sh;

     

       66
       71
        
       

     

       72
       72
       +
         postPatch = ''

     

       73
       73
       +
           cp -v ${fastdeploy.cmake}/Findonnxruntime.cmake cmake/

     

       74
       74
       +
         '';

     

       75
       75
       +
       

     

       67
       76
        
         postInstall = ''

     

       68
       77
        
           mkdir -p $out/share/${finalAttr.pname}

     

       69
       78
        
           mv $out/{Python,resource} $out/share/${finalAttr.pname}

     
···

       74
       83
        
           homepage = "https://github.com/MaaAssistantArknights/MaaAssistantArknights";

     

       75
       84
        
           license = licenses.agpl3Only;

     

       76
       85
        
           maintainers = with maintainers; [ Cryolitia ];

     

       77
       77
       -
           platforms = platforms.linux;

     

       86
       86
       +
           platforms = platforms.linux ++ platforms.darwin;

     

       78
       87
        
         };

     

       79
       88
        
       })

+33 -19

pkgs/by-name/ma/maa-cli/package.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , stdenv

     

       3
       3
       -
       , rustPlatform

     

       4
       4
       -
       , fetchFromGitHub

     

       5
       5
       -
       , installShellFiles

     

       6
       6
       -
       , makeWrapper

     

       7
       7
       -
       , pkg-config

     

       8
       8
       -
       , openssl

     

       9
       9
       -
       , maa-assistant-arknights

     

       10
       10
       -
       , android-tools

     

       11
       11
       -
       , git

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         rustPlatform,

     

       5
       5
       +
         fetchFromGitHub,

     

       6
       6
       +
         installShellFiles,

     

       7
       7
       +
         makeWrapper,

     

       8
       8
       +
         pkg-config,

     

       9
       9
       +
         openssl,

     

       10
       10
       +
         darwin,

     

       11
       11
       +
         maa-assistant-arknights,

     

       12
       12
       +
         android-tools,

     

       13
       13
       +
         git,

     

       12
       14
        
       }:

     

       13
       15
        
       

     

       14
       16
        
       rustPlatform.buildRustPackage rec {

     
···

       28
       30
        
           pkg-config

     

       29
       31
        
         ];

     

       30
       32
        
       

     

       31
       31
       -
         buildInputs = [

     

       32
       32
       -
           openssl

     

       33
       33
       -
         ];

     

       33
       33
       +
         buildInputs =

     

       34
       34
       +
           [ openssl ]

     

       35
       35
       +
           ++ lib.optionals stdenv.isDarwin (

     

       36
       36
       +
             with darwin.apple_sdk.frameworks;

     

       37
       37
       +
             [

     

       38
       38
       +
               Security

     

       39
       39
       +
               SystemConfiguration

     

       40
       40
       +
             ]

     

       41
       41
       +
           );

     

       34
       42
        
       

     

       35
       43
        
         # https://github.com/MaaAssistantArknights/maa-cli/pull/126

     

       36
       44
        
         buildNoDefaultFeatures = true;

     

       37
       37
       -
         buildFeatures = [ "git2" "core_installer" ];

     

       45
       45
       +
         buildFeatures = [

     

       46
       46
       +
           "git2"

     

       47
       47
       +
           "core_installer"

     

       48
       48
       +
         ];

     

       38
       49
        
       

     

       39
       50
        
         cargoHash = "sha256-iy9myT3bVW1TXCZx3ddiiDoDXx5BWqeQnSsJ97bc4IA=";

     

       40
       51
        
       

     
···

       47
       58
        
           mv $out/bin/maa $out/share/maa-assistant-arknights/

     

       48
       59
        
       

     

       49
       60
        
           makeWrapper $out/share/maa-assistant-arknights/maa $out/bin/maa \

     

       50
       50
       -
             --prefix PATH : "${lib.makeBinPath [

     

       51
       51
       -
               android-tools git

     

       52
       52
       -
             ]}"

     

       61
       61
       +
             --prefix PATH : "${

     

       62
       62
       +
               lib.makeBinPath [

     

       63
       63
       +
                 android-tools

     

       64
       64
       +
                 git

     

       65
       65
       +
               ]

     

       66
       66
       +
             }"

     

       53
       67
        
       

     

       54
       68
        
           installShellCompletion --cmd maa \

     

       55
       69
        
             --bash <($out/bin/maa complete bash) \

     
···

       65
       79
        
           description = "A simple CLI for MAA by Rust";

     

       66
       80
        
           homepage = "https://github.com/MaaAssistantArknights/maa-cli";

     

       67
       81
        
           license = licenses.agpl3Only;

     

       68
       68
       -
           platforms = platforms.linux;

     

       82
       82
       +
           platforms = platforms.linux ++ platforms.darwin;

     

       69
       83
        
           maintainers = with maintainers; [ Cryolitia ];

     

       70
       84
        
           mainProgram = "maa";

     

       71
       85
        
         };

+49

pkgs/by-name/mc/mcdreforged/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         fetchFromGitHub,

     

       4
       4
       +
         python3,

     

       5
       5
       +
         testers,

     

       6
       6
       +
         mcdreforged,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       python3.pkgs.buildPythonApplication rec {

     

       10
       10
       +
         pname = "mcdreforged";

     

       11
       11
       +
         version = "2.12.3";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchFromGitHub {

     

       14
       14
       +
           owner = "Fallen-Breath";

     

       15
       15
       +
           repo = "MCDReforged";

     

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

     

       17
       17
       +
           sha256 = "sha256-MLub++mkkB/jshpHJXtqgIhs7Gcb4jHUyHqGE65S8A8=";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         disabled = python3.pkgs.pythonOlder "3.8";

     

       21
       21
       +
       

     

       22
       22
       +
         build-system = [ python3.pkgs.setuptools ];

     

       23
       23
       +
       

     

       24
       24
       +
         dependencies = with python3.pkgs; [

     

       25
       25
       +
           colorlog

     

       26
       26
       +
           colorama

     

       27
       27
       +
           packaging

     

       28
       28
       +
           parse

     

       29
       29
       +
           prompt-toolkit

     

       30
       30
       +
           psutil

     

       31
       31
       +
           ruamel-yaml

     

       32
       32
       +
           typing-extensions

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         nativeCheckInputs = [ python3.pkgs.pytestCheckHook ];

     

       36
       36
       +
       

     

       37
       37
       +
         passthru.tests = {

     

       38
       38
       +
           version = testers.testVersion { package = mcdreforged; };

     

       39
       39
       +
         };

     

       40
       40
       +
       

     

       41
       41
       +
         meta = with lib; {

     

       42
       42
       +
           description = "A rewritten version of MCDaemon, a python tool to control your Minecraft server";

     

       43
       43
       +
           homepage = "https://mcdreforged.com";

     

       44
       44
       +
           changelog = "https://github.com/MCDReforged/MCDReforged/releases/tag/v${version}";

     

       45
       45
       +
           license = licenses.lgpl3Only;

     

       46
       46
       +
           maintainers = with maintainers; [ moraxyc ];

     

       47
       47
       +
           mainProgram = "mcdreforged";

     

       48
       48
       +
         };

     

       49
       49
       +
       }

+45

pkgs/by-name/md/md-tui/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         rustPlatform,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         pkg-config,

     

       6
       6
       +
         stdenv,

     

       7
       7
       +
         darwin,

     

       8
       8
       +
         nix-update-script,

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       rustPlatform.buildRustPackage rec {

     

       12
       12
       +
         pname = "md-tui";

     

       13
       13
       +
         version = "0.8.1";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "henriklovhaug";

     

       17
       17
       +
           repo = "md-tui";

     

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

     

       19
       19
       +
           hash = "sha256-AwJvB1xLsJCr+r0RJi8jH50QlPq7mbUibvmvYZJi9XE=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         cargoHash = "sha256-QapogSDuAiQWbCFFwPiaSpvLHn0oRLwBEBuB44MN/t0=";

     

       23
       23
       +
       

     

       24
       24
       +
         nativeBuildInputs = [ pkg-config ];

     

       25
       25
       +
       

     

       26
       26
       +
         buildInputs = lib.optionals stdenv.isDarwin [

     

       27
       27
       +
           darwin.apple_sdk.frameworks.CoreFoundation

     

       28
       28
       +
           darwin.apple_sdk.frameworks.CoreServices

     

       29
       29
       +
           darwin.apple_sdk.frameworks.Security

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         passthru = {

     

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

     

       34
       34
       +
         };

     

       35
       35
       +
       

     

       36
       36
       +
         meta = {

     

       37
       37
       +
           description = "Markdown renderer in the terminal";

     

       38
       38
       +
           homepage = "https://github.com/henriklovhaug/md-tui";

     

       39
       39
       +
           changelog = "https://github.com/henriklovhaug/md-tui/blob/${src.rev}/CHANGELOG.md";

     

       40
       40
       +
           license = lib.licenses.agpl3Only;

     

       41
       41
       +
           maintainers = with lib.maintainers; [ GaetanLepage ];

     

       42
       42
       +
           platforms = lib.platforms.all;

     

       43
       43
       +
           mainProgram = "mdt";

     

       44
       44
       +
         };

     

       45
       45
       +
       }

+60

pkgs/by-name/nb/nb-cli/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         fetchPypi,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         nb-cli,

     

       5
       5
       +
         python3,

     

       6
       6
       +
         testers,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       python3.pkgs.buildPythonApplication rec {

     

       10
       10
       +
         pname = "nb-cli";

     

       11
       11
       +
         version = "1.4.1";

     

       12
       12
       +
         pyproject = true;

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchPypi {

     

       15
       15
       +
           pname = "nb_cli";

     

       16
       16
       +
           inherit version;

     

       17
       17
       +
           hash = "sha256-kI3Uy79mv0b+h5wjrRN3My9jOFzryhkStieqaG0YFvM=";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         build-system = [

     

       21
       21
       +
           python3.pkgs.babel

     

       22
       22
       +
           python3.pkgs.pdm-backend

     

       23
       23
       +
         ];

     

       24
       24
       +
       

     

       25
       25
       +
         dependencies = with python3.pkgs; [

     

       26
       26
       +
           anyio

     

       27
       27
       +
           cashews

     

       28
       28
       +
           click

     

       29
       29
       +
           cookiecutter

     

       30
       30
       +
           httpx

     

       31
       31
       +
           importlib-metadata

     

       32
       32
       +
           jinja2

     

       33
       33
       +
           noneprompt

     

       34
       34
       +
           pydantic

     

       35
       35
       +
           pyfiglet

     

       36
       36
       +
           tomlkit

     

       37
       37
       +
           typing-extensions

     

       38
       38
       +
           virtualenv

     

       39
       39
       +
           watchfiles

     

       40
       40
       +
           wcwidth

     

       41
       41
       +
         ];

     

       42
       42
       +
       

     

       43
       43
       +
         # no test

     

       44
       44
       +
         doCheck = false;

     

       45
       45
       +
       

     

       46
       46
       +
         pythonImportsCheck = [ "nb_cli" ];

     

       47
       47
       +
       

     

       48
       48
       +
         passthru.tests = {

     

       49
       49
       +
           version = testers.testVersion { package = nb-cli; };

     

       50
       50
       +
         };

     

       51
       51
       +
       

     

       52
       52
       +
         meta = {

     

       53
       53
       +
           description = "CLI for nonebot2";

     

       54
       54
       +
           homepage = "https://cli.nonebot.dev";

     

       55
       55
       +
           changelog = "https://github.com/nonebot/nb-cli/releases/tag/v${version}";

     

       56
       56
       +
           license = lib.licenses.mit;

     

       57
       57
       +
           maintainers = with lib.maintainers; [ moraxyc ];

     

       58
       58
       +
           mainProgram = "nb";

     

       59
       59
       +
         };

     

       60
       60
       +
       }

+2 -2

pkgs/by-name/nu/nulloy/package.nix

···

       12
       12
        
       

     

       13
       13
        
       stdenv.mkDerivation rec {

     

       14
       14
        
         pname = "nulloy";

     

       15
       15
       -
         version = "0.9.8.7";

     

       15
       15
       +
         version = "0.9.9";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "nulloy";

     

       19
       19
        
           repo = "nulloy";

     

       20
       20
        
           rev = version;

     

       21
       21
       -
           hash = "sha256-s8DzL7pp3hmD9k8pVqmk7WGq3zZ1tLF9C+jxcRtJOXA=";

     

       21
       21
       +
           hash = "sha256-vFg789vBV7ks+4YiWWl3u0/kQjzpAiX8dMfXU0hynDM=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [

+4

pkgs/by-name/tp/tpnote/package.nix

···

       39
       39
        
            SystemConfiguration

     

       40
       40
        
         ]);

     

       41
       41
        
       

     

       42
       42
       +
         postInstall = ''

     

       43
       43
       +
           installManPage docs/build/man/man1/tpnote.1

     

       44
       44
       +
         '';

     

       45
       45
       +
       

     

       42
       46
        
         RUSTONIG_SYSTEM_LIBONIG = true;

     

       43
       47
        
       

     

       44
       48
        
         passthru.tests.version = testers.testVersion { package = tpnote; };

+6 -1

pkgs/development/interpreters/python/cpython/default.nix

···

       307
       307
        
           # (since it will do a futile invocation of gcc (!) to find

     

       308
       308
        
           # libuuid, slowing down program startup a lot).

     

       309
       309
        
           noldconfigPatch

     

       310
       310
       +
         ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.isFreeBSD) [

     

       311
       311
       +
           # Cross compilation only supports a limited number of "known good"

     

       312
       312
       +
           # configurations. If you're reading this and it's been a long time

     

       313
       313
       +
           # since this diff, consider submitting this patch upstream!

     

       314
       314
       +
           ./freebsd-cross.patch

     

       315
       315
       +
         ] ++ optionals (pythonOlder "3.13") [

     

       310
       316
        
           # Make sure that the virtualenv activation scripts are

     

       311
       317
        
           # owner-writable, so venvs can be recreated without permission

     

       312
       318
        
           # errors.

     

       313
       313
       -
         ] ++ optionals (pythonOlder "3.13") [

     

       314
       319
        
           ./virtualenv-permissions.patch

     

       315
       320
        
         ] ++ optionals (pythonAtLeast "3.13") [

     

       316
       321
        
           ./3.13/virtualenv-permissions.patch

+22

pkgs/development/interpreters/python/cpython/freebsd-cross.patch

···

       1
       1
       +
       --- a/configure.ac	2024-06-07 09:17:50.608162031 -0700

     

       2
       2
       +
       +++ b/configure.ac	2024-06-07 09:45:59.844518241 -0700

     

       3
       3
       +
       @@ -554,6 +554,9 @@

     

       4
       4
       +
        	*-*-wasi)

     

       5
       5
       +
        	    ac_sys_system=WASI

     

       6
       6
       +
        	    ;;

     

       7
       7
       +
       +	*-*-freebsd)

     

       8
       8
       +
       +	    ac_sys_system=FreeBSD

     

       9
       9
       +
       +	    ;;

     

       10
       10
       +
        	*)

     

       11
       11
       +
        		# for now, limit cross builds to known configurations

     

       12
       12
       +
        		MACHDEP="unknown"

     

       13
       13
       +
       @@ -614,6 +617,9 @@

     

       14
       14
       +
        	wasm32-*-* | wasm64-*-*)

     

       15
       15
       +
        		_host_cpu=$host_cpu

     

       16
       16
       +
        		;;

     

       17
       17
       +
       +	x86_64-*-freebsd)

     

       18
       18
       +
       +		_host_cpu=x86_64

     

       19
       19
       +
       +		;;

     

       20
       20
       +
        	*)

     

       21
       21
       +
        		# for now, limit cross builds to known configurations

     

       22
       22
       +
        		MACHDEP="unknown"

+3

pkgs/development/interpreters/ruby/default.nix

···

       160
       160
        
                 "--with-out-ext=tk"

     

       161
       161
        
                 # on yosemite, "generating encdb.h" will hang for a very long time without this flag

     

       162
       162
        
                 "--with-setjmp-type=setjmp"

     

       163
       163
       +
               ] ++ ops stdenv.hostPlatform.isFreeBSD [

     

       164
       164
       +
                 "rb_cv_gnu_qsort_r=no"

     

       165
       165
       +
                 "rb_cv_bsd_qsort_r=yes"

     

       163
       166
        
               ];

     

       164
       167
        
       

     

       165
       168
        
               preConfigure = opString docSupport ''

+2 -2

pkgs/development/libraries/tkrzw/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "tkrzw";

     

       5
       5
       -
         version = "1.0.29";

     

       5
       5
       +
         version = "1.0.31";

     

       6
       6
        
         # TODO: defeat multi-output reference cycles

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz";

     

       10
       10
       -
           hash = "sha256-q6q9b8iaGe2KICrDcRvDsHY9kovDqO7upzo2effn95A=";

     

       10
       10
       +
           hash = "sha256-7FdHglIBTHGKRt66WNTGEe5qUcrIyTYPrnuVrUc8l08=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         postPatch = ''

+70

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

···

       1
       1
       +
       {

     

       2
       2
       +
         bitarray,

     

       3
       3
       +
         buildPythonPackage,

     

       4
       4
       +
         dill,

     

       5
       5
       +
         diskcache,

     

       6
       6
       +
         fetchFromGitHub,

     

       7
       7
       +
         hiredis,

     

       8
       8
       +
         hypothesis,

     

       9
       9
       +
         lib,

     

       10
       10
       +
         pytest,

     

       11
       11
       +
         pytest-asyncio,

     

       12
       12
       +
         pytest-cov,

     

       13
       13
       +
         pytest-rerunfailures,

     

       14
       14
       +
         pytestCheckHook,

     

       15
       15
       +
         redis,

     

       16
       16
       +
         setuptools,

     

       17
       17
       +
         xxhash,

     

       18
       18
       +
       }:

     

       19
       19
       +
       

     

       20
       20
       +
       buildPythonPackage rec {

     

       21
       21
       +
         pname = "cashews";

     

       22
       22
       +
         version = "7.1.0";

     

       23
       23
       +
         pyproject = true;

     

       24
       24
       +
       

     

       25
       25
       +
         src = fetchFromGitHub {

     

       26
       26
       +
           owner = "Krukov";

     

       27
       27
       +
           repo = "cashews";

     

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

     

       29
       29
       +
           hash = "sha256-VzIW6/xhKk+ZWd29BYQp6sjpBst8IVz8t/hCLc2LFT4=";

     

       30
       30
       +
         };

     

       31
       31
       +
       

     

       32
       32
       +
         build-system = [ setuptools ];

     

       33
       33
       +
       

     

       34
       34
       +
         passthru.optional-dependencies = {

     

       35
       35
       +
           dill = [ dill ];

     

       36
       36
       +
           diskcache = [ diskcache ];

     

       37
       37
       +
           redis = [ redis ];

     

       38
       38
       +
           speedup = [

     

       39
       39
       +
             bitarray

     

       40
       40
       +
             hiredis

     

       41
       41
       +
             xxhash

     

       42
       42
       +
           ];

     

       43
       43
       +
         };

     

       44
       44
       +
       

     

       45
       45
       +
         nativeCheckInputs = [

     

       46
       46
       +
           hypothesis

     

       47
       47
       +
           pytest

     

       48
       48
       +
           pytest-asyncio

     

       49
       49
       +
           pytest-cov

     

       50
       50
       +
           pytest-rerunfailures

     

       51
       51
       +
           pytestCheckHook

     

       52
       52
       +
         ];

     

       53
       53
       +
       

     

       54
       54
       +
         disabledTests = [

     

       55
       55
       +
           # these tests require too many dependencies

     

       56
       56
       +
           "redis"

     

       57
       57
       +
           "diskcache"

     

       58
       58
       +
           "integration"

     

       59
       59
       +
         ];

     

       60
       60
       +
       

     

       61
       61
       +
         pythonImportsCheck = [ "cashews" ];

     

       62
       62
       +
       

     

       63
       63
       +
         meta = {

     

       64
       64
       +
           description = "Cache tools with async power";

     

       65
       65
       +
           homepage = "https://github.com/Krukov/cashews/";

     

       66
       66
       +
           changelog = "https://github.com/Krukov/cashews/releases/tag/${version}";

     

       67
       67
       +
           license = lib.licenses.mit;

     

       68
       68
       +
           maintainers = with lib.maintainers; [ moraxyc ];

     

       69
       69
       +
         };

     

       70
       70
       +
       }

+45

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

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildPythonPackage,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         pytestCheckHook,

     

       6
       6
       +
         pythonOlder,

     

       7
       7
       +
       

     

       8
       8
       +
         libpysal,

     

       9
       9
       +
         numpy,

     

       10
       10
       +
         scipy,

     

       11
       11
       +
         setuptools-scm,

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       buildPythonPackage rec {

     

       15
       15
       +
         pname = "inequality";

     

       16
       16
       +
         version = "1.0.1";

     

       17
       17
       +
         pyproject = true;

     

       18
       18
       +
         disabled = pythonOlder "3.10";

     

       19
       19
       +
       

     

       20
       20
       +
         src = fetchFromGitHub {

     

       21
       21
       +
           owner = "pysal";

     

       22
       22
       +
           repo = "inequality";

     

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

     

       24
       24
       +
           hash = "sha256-dy1/KXnmIh5LnTxuyYfIvtt1p2CIpNQ970o5pTg6diQ=";

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         build-system = [ setuptools-scm ];

     

       28
       28
       +
       

     

       29
       29
       +
         propagatedBuildInputs = [

     

       30
       30
       +
           libpysal

     

       31
       31
       +
           numpy

     

       32
       32
       +
           scipy

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         nativeCheckInputs = [ pytestCheckHook ];

     

       36
       36
       +
       

     

       37
       37
       +
         pythonImportsCheck = [ "inequality" ];

     

       38
       38
       +
       

     

       39
       39
       +
         meta = {

     

       40
       40
       +
           description = "Spatial inequality analysis";

     

       41
       41
       +
           homepage = "https://github.com/pysal/inequality";

     

       42
       42
       +
           license = lib.licenses.bsd3;

     

       43
       43
       +
           maintainers = lib.teams.geospatial.members;

     

       44
       44
       +
         };

     

       45
       45
       +
       }

+40

pkgs/development/python-modules/matplotlib-venn/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         fetchPypi,

     

       4
       4
       +
         buildPythonPackage,

     

       5
       5
       +
         setuptools,

     

       6
       6
       +
         matplotlib,

     

       7
       7
       +
         numpy,

     

       8
       8
       +
         scipy,

     

       9
       9
       +
         pytestCheckHook,

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       buildPythonPackage rec {

     

       13
       13
       +
         version = "0.11.10";

     

       14
       14
       +
         pname = "matplotlib-venn";

     

       15
       15
       +
       

     

       16
       16
       +
         pyproject = true;

     

       17
       17
       +
       

     

       18
       18
       +
         src = fetchPypi {

     

       19
       19
       +
           inherit pname version;

     

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

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         build-system = [ setuptools ];

     

       24
       24
       +
       

     

       25
       25
       +
         dependencies = [

     

       26
       26
       +
           matplotlib

     

       27
       27
       +
           numpy

     

       28
       28
       +
           scipy

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         nativeCheckInputs = [ pytestCheckHook ];

     

       32
       32
       +
       

     

       33
       33
       +
         meta = {

     

       34
       34
       +
           description = "Functions for plotting area-proportional two- and three-way Venn diagrams in matplotlib";

     

       35
       35
       +
           homepage = "https://github.com/konstantint/matplotlib-venn";

     

       36
       36
       +
           changelog = "https://github.com/konstantint/matplotlib-venn/releases/tag/${version}";

     

       37
       37
       +
           license = lib.licenses.mit;

     

       38
       38
       +
           maintainers = with lib.maintainers; [ moraxyc ];

     

       39
       39
       +
         };

     

       40
       40
       +
       }

+57

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

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildPythonPackage,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         pytestCheckHook,

     

       6
       6
       +
         pythonOlder,

     

       7
       7
       +
       

     

       8
       8
       +
         geopandas,

     

       9
       9
       +
         inequality,

     

       10
       10
       +
         libpysal,

     

       11
       11
       +
         mapclassify,

     

       12
       12
       +
         networkx,

     

       13
       13
       +
         packaging,

     

       14
       14
       +
         pandas,

     

       15
       15
       +
         setuptools-scm,

     

       16
       16
       +
         shapely,

     

       17
       17
       +
         tqdm,

     

       18
       18
       +
       }:

     

       19
       19
       +
       

     

       20
       20
       +
       buildPythonPackage rec {

     

       21
       21
       +
         pname = "momepy";

     

       22
       22
       +
         version = "0.7.0";

     

       23
       23
       +
         pyproject = true;

     

       24
       24
       +
         disabled = pythonOlder "3.10";

     

       25
       25
       +
       

     

       26
       26
       +
         src = fetchFromGitHub {

     

       27
       27
       +
           owner = "pysal";

     

       28
       28
       +
           repo = "momepy";

     

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

     

       30
       30
       +
           hash = "sha256-HVp2a0z+5fbfkNSxnTfZPCgG2SJMlKX/zso14M18mCk=";

     

       31
       31
       +
         };

     

       32
       32
       +
       

     

       33
       33
       +
         build-system = [ setuptools-scm ];

     

       34
       34
       +
       

     

       35
       35
       +
         propagatedBuildInputs = [

     

       36
       36
       +
           geopandas

     

       37
       37
       +
           inequality

     

       38
       38
       +
           libpysal

     

       39
       39
       +
           mapclassify

     

       40
       40
       +
           networkx

     

       41
       41
       +
           packaging

     

       42
       42
       +
           pandas

     

       43
       43
       +
           shapely

     

       44
       44
       +
           tqdm

     

       45
       45
       +
         ];

     

       46
       46
       +
       

     

       47
       47
       +
         nativeCheckInputs = [ pytestCheckHook ];

     

       48
       48
       +
       

     

       49
       49
       +
         pythonImportsCheck = [ "momepy" ];

     

       50
       50
       +
       

     

       51
       51
       +
         meta = {

     

       52
       52
       +
           description = "Urban Morphology Measuring Toolkit";

     

       53
       53
       +
           homepage = "https://github.com/pysal/momepy";

     

       54
       54
       +
           license = lib.licenses.bsd3;

     

       55
       55
       +
           maintainers = lib.teams.geospatial.members;

     

       56
       56
       +
         };

     

       57
       57
       +
       }

+39

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

···

       1
       1
       +
       {

     

       2
       2
       +
         buildPythonPackage,

     

       3
       3
       +
         fetchPypi,

     

       4
       4
       +
         lib,

     

       5
       5
       +
         poetry-core,

     

       6
       6
       +
         prompt-toolkit,

     

       7
       7
       +
         pythonOlder,

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       buildPythonPackage rec {

     

       11
       11
       +
         pname = "noneprompt";

     

       12
       12
       +
         version = "0.1.9";

     

       13
       13
       +
         pyproject = true;

     

       14
       14
       +
       

     

       15
       15
       +
         disabled = pythonOlder "3.8";

     

       16
       16
       +
       

     

       17
       17
       +
         src = fetchPypi {

     

       18
       18
       +
           inherit pname version;

     

       19
       19
       +
           hash = "sha256-M4uLuJqNIu818d7bOqfBsijPE5lzvcQ8X/w+72RFfbk=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         build-system = [ poetry-core ];

     

       23
       23
       +
       

     

       24
       24
       +
         dependencies = [ prompt-toolkit ];

     

       25
       25
       +
       

     

       26
       26
       +
         # no test

     

       27
       27
       +
         doCheck = false;

     

       28
       28
       +
       

     

       29
       29
       +
         pythonImportsCheck = [ "noneprompt" ];

     

       30
       30
       +
       

     

       31
       31
       +
         meta = {

     

       32
       32
       +
           description = "Prompt toolkit for console interaction";

     

       33
       33
       +
           homepage = "https://github.com/nonebot/noneprompt";

     

       34
       34
       +
           changelog = "https://github.com/nonebot/noneprompt/releases/tag/v${version}";

     

       35
       35
       +
           license = lib.licenses.mit;

     

       36
       36
       +
           maintainers = with lib.maintainers; [ moraxyc ];

     

       37
       37
       +
           mainProgram = "noneprompt";

     

       38
       38
       +
         };

     

       39
       39
       +
       }

+14 -2

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

···

       6
       6
        
         scipy,

     

       7
       7
        
         sympy,

     

       8
       8
        
         setuptools,

     

       9
       9
       +
         pynose,

     

       10
       10
       +
         cython,

     

       9
       11
        
       }:

     

       10
       12
        
       

     

       11
       13
        
       buildPythonPackage rec {

     
···

       26
       28
        
           sympy

     

       27
       29
        
         ];

     

       28
       30
        
       

     

       29
       29
       -
         # nose test does not support 3.10 or later

     

       30
       30
       -
         doCheck = false;

     

       31
       31
       +
         nativeCheckInputs = [

     

       32
       32
       +
           pynose

     

       33
       33
       +
           cython

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         checkPhase = ''

     

       37
       37
       +
           runHook preCheck

     

       38
       38
       +
       

     

       39
       39
       +
           nosetests pydy

     

       40
       40
       +
       

     

       41
       41
       +
           runHook postCheck

     

       42
       42
       +
         '';

     

       31
       43
        
       

     

       32
       44
        
         pythonImportsCheck = [ "pydy" ];

     

       33
       45

+5 -5

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

···

       1
       1
        
       {

     

       2
       2
       -
         lib,

     

       3
       2
        
         buildPythonPackage,

     

       4
       3
        
         fetchPypi,

     

       5
       4
        
         flit-core,

     

       5
       5
       +
         lib,

     

       6
       6
        
         pythonOlder,

     

       7
       7
        
         typing-extensions,

     

       8
       8
       -
         unittestCheckHook,

     

       9
       8
        
       }:

     

       10
       9
        
       

     

       11
       10
        
       buildPythonPackage rec {

     

       12
       11
        
         pname = "pypdf2";

     

       13
       12
        
         version = "3.0.1";

     

       14
       13
        
       

     

       15
       15
       -
         format = "pyproject";

     

       14
       14
       +
         pyproject = true;

     

       16
       15
        
       

     

       17
       16
        
         src = fetchPypi {

     

       18
       17
        
           pname = "PyPDF2";

     
···

       22
       21
        
       

     

       23
       22
        
         nativeBuildInputs = [ flit-core ];

     

       24
       23
        
       

     

       25
       25
       -
         propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ typing-extensions ];

     

       24
       24
       +
         dependencies = lib.optionals (pythonOlder "3.10") [ typing-extensions ];

     

       26
       25
        
       

     

       27
       27
       -
         nativeCheckInputs = [ unittestCheckHook ];

     

       26
       26
       +
         # no test

     

       27
       27
       +
         doCheck = false;

     

       28
       28
        
       

     

       29
       29
        
         pythonImportsCheck = [ "PyPDF2" ];

     

       30
       30

+21 -4

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

···

       1
       1
        
       {

     

       2
       2
       -
         lib,

     

       3
       2
        
         buildPythonPackage,

     

       4
       3
        
         fetchFromGitHub,

     

       4
       4
       +
         fetchpatch,

     

       5
       5
       +
         lib,

     

       5
       6
        
         mock,

     

       7
       7
       +
         packaging,

     

       6
       8
        
         ply,

     

       7
       9
        
         pytestCheckHook,

     

       8
       8
       -
         pythonAtLeast,

     

       9
       10
        
         pythonOlder,

     

       10
       11
        
         setuptools,

     

       11
       12
        
         six,

     
···

       16
       17
        
         version = "3.3.6";

     

       17
       18
        
         pyproject = true;

     

       18
       19
        
       

     

       19
       19
       -
         # distutils removal, https://github.com/dropbox/stone/issues/323

     

       20
       20
       -
         disabled = pythonOlder "3.7" || pythonAtLeast "3.12";

     

       20
       20
       +
         disabled = pythonOlder "3.7";

     

       21
       21
       +
       

     

       22
       22
       +
         patches = [

     

       23
       23
       +
           # fix distutils issue

     

       24
       24
       +
           # fix versions in tests to conform pep 440

     

       25
       25
       +
           # See https://github.com/dropbox/stone/pull/334

     

       26
       26
       +
           (fetchpatch {

     

       27
       27
       +
             name = "no-distutils.patch";

     

       28
       28
       +
             url = "https://github.com/dropbox/stone/commit/f772d8d3b7e2ce62b14b4fb208a478bc8e54c7f2.patch";

     

       29
       29
       +
             hash = "sha256-SH4gG5S13n/pXppm62LvH9poGfeQGGonW7bkzdYh73Q=";

     

       30
       30
       +
           })

     

       31
       31
       +
           (fetchpatch {

     

       32
       32
       +
             name = "fix-test-pep-440.patch";

     

       33
       33
       +
             url = "https://github.com/dropbox/stone/commit/f36de56b1f87eae61829258b2f16aa8319bbcc5c.patch";

     

       34
       34
       +
             hash = "sha256-sBJukNk02RmQQza1qhLAkyx1OJRck0/zQOeRaXD9tkY=";

     

       35
       35
       +
           })

     

       36
       36
       +
         ];

     

       21
       37
        
       

     

       22
       38
        
         src = fetchFromGitHub {

     

       23
       39
        
           owner = "dropbox";

     
···

       36
       52
        
         dependencies = [

     

       37
       53
        
           ply

     

       38
       54
        
           six

     

       55
       55
       +
           packaging

     

       39
       56
        
         ];

     

       40
       57
        
       

     

       41
       58
        
         nativeCheckInputs = [

+1

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

···

       201
       201
        
             MPISupport && cudaSupport && (mpi.cudatoolkit != cudaPackages.cudatoolkit);

     

       202
       202
        
           "Magma cudaPackages does not match cudaPackages" =

     

       203
       203
        
             cudaSupport && (effectiveMagma.cudaPackages != cudaPackages);

     

       204
       204
       +
           "Rocm support is currently broken because `rocmPackages.hipblaslt` is unpackaged. (2024-06-09)" = rocmSupport;

     

       204
       205
        
         };

     

       205
       206
        
       in

     

       206
       207
        
       buildPythonPackage rec {

+2

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

···

       140
       140
        
         };

     

       141
       141
        
       

     

       142
       142
        
         meta = with lib; {

     

       143
       143
       +
           mainProgram = "gdb";

     

       144
       144
       +
       

     

       143
       145
        
           description = "The GNU Project debugger";

     

       144
       146
        
       

     

       145
       147
        
           longDescription = ''

+2 -2

pkgs/tools/audio/abcmidi/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "abcMIDI";

     

       5
       5
       -
         version = "2024.04.30";

     

       5
       5
       +
         version = "2024.06.03";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchzip {

     

       8
       8
        
           url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";

     

       9
       9
       -
           hash = "sha256-Yw/EQZlGTYxouRL1Tf4TDSNWMleB7vKzWg4n6sw5d4Q=";

     

       9
       9
       +
           hash = "sha256-iq/NnXMATYRCjeBlcSvgdCVe2lDz/Tade7GQnlCygGM=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         meta = with lib; {

+8 -3

pkgs/tools/networking/dhcpcd/default.nix

···

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , pkg-config

     

       5
       5
        
       , udev

     

       6
       6
       +
       , freebsd

     

       6
       7
        
       , runtimeShellPackage

     

       7
       8
        
       , runtimeShell

     

       8
       9
        
       , nixosTests

     
···

       22
       23
        
       

     

       23
       24
        
         nativeBuildInputs = [ pkg-config ];

     

       24
       25
        
         buildInputs = [

     

       26
       26
       +
           runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts

     

       27
       27
       +
         ] ++ lib.optionals stdenv.isLinux [

     

       25
       28
        
           udev

     

       26
       26
       -
           runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts

     

       29
       29
       +
         ] ++ lib.optionals stdenv.isFreeBSD [

     

       30
       30
       +
           freebsd.libcapsicum

     

       31
       31
       +
           freebsd.libcasper

     

       27
       32
        
         ];

     

       28
       33
        
       

     

       29
       34
        
         postPatch = ''

     
···

       52
       57
        
         installFlags = [ "DBDIR=$(TMPDIR)/db" "SYSCONFDIR=${placeholder "out"}/etc" ];

     

       53
       58
        
       

     

       54
       59
        
         # Check that the udev plugin got built.

     

       55
       55
       -
         postInstall = lib.optionalString (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]";

     

       60
       60
       +
         postInstall = lib.optionalString (udev != null && stdenv.isLinux) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]";

     

       56
       61
        
       

     

       57
       62
        
         passthru = {

     

       58
       63
        
           inherit enablePrivSep;

     
···

       62
       67
        
         meta = with lib; {

     

       63
       68
        
           description = "A client for the Dynamic Host Configuration Protocol (DHCP)";

     

       64
       69
        
           homepage = "https://roy.marples.name/projects/dhcpcd";

     

       65
       65
       -
           platforms = platforms.linux;

     

       70
       70
       +
           platforms = platforms.linux ++ platforms.freebsd;

     

       66
       71
        
           license = licenses.bsd2;

     

       67
       72
        
           maintainers = with maintainers; [ eelco ];

     

       68
       73
        
           mainProgram = "dhcpcd";

+4 -4

pkgs/tools/security/zmap/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libjson, json_c, gengetopt, flex, byacc, gmp

     

       2
       2
       -
       , libpcap, libunistring

     

       2
       2
       +
       , libpcap, libunistring, judy

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "zmap";

     

       7
       7
       -
         version = "3.0.0";

     

       7
       7
       +
         version = "4.1.1";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "zmap";

     

       11
       11
        
           repo = pname;

     

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

     

       13
       13
       -
           sha256 = "sha256-OJZKcnsuBi3z/AI05RMBitgn01bhVTqx2jFYJLuIJk4=";

     

       13
       13
       +
           sha256 = "sha256-ftdjIBAAe+3qUEHoNMAOCmzy+PWD4neIMWvFXFi2JFo=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         cmakeFlags = [ "-DRESPECT_INSTALL_PREFIX_CONFIG=ON" ];

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ cmake pkg-config gengetopt flex byacc ];

     

       19
       19
       -
         buildInputs = [ libjson json_c gmp libpcap libunistring ];

     

       19
       19
       +
         buildInputs = [ libjson json_c gmp libpcap libunistring judy ];

     

       20
       20
        
       

     

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

     

       22
       22

+10

pkgs/top-level/python-packages.nix

···

       1945
       1945
        
       

     

       1946
       1946
        
         cashaddress = callPackage ../development/python-modules/cashaddress { };

     

       1947
       1947
        
       

     

       1948
       1948
       +
         cashews = callPackage ../development/python-modules/cashews {  };

     

       1949
       1949
       +
       

     

       1948
       1950
        
         cassandra-driver = callPackage ../development/python-modules/cassandra-driver { };

     

       1949
       1951
        
       

     

       1950
       1952
        
         castepxbin = callPackage ../development/python-modules/castepxbin { };

     
···

       5785
       5787
        
       

     

       5786
       5788
        
         indexed-zstd = callPackage ../development/python-modules/indexed-zstd { inherit (pkgs) zstd; };

     

       5787
       5789
        
       

     

       5790
       5790
       +
         inequality = callPackage ../development/python-modules/inequality { };

     

       5791
       5791
       +
       

     

       5788
       5792
        
         infinity = callPackage ../development/python-modules/infinity { };

     

       5789
       5793
        
       

     

       5790
       5794
        
         inflect = callPackage ../development/python-modules/inflect { };

     
···

       7275
       7279
        
       

     

       7276
       7280
        
         matplotlib-sixel = callPackage ../development/python-modules/matplotlib-sixel { };

     

       7277
       7281
        
       

     

       7282
       7282
       +
         matplotlib-venn = callPackage ../development/python-modules/matplotlib-venn { };

     

       7283
       7283
       +
       

     

       7278
       7284
        
         matplotx = callPackage ../development/python-modules/matplotx { };

     

       7279
       7285
        
       

     

       7280
       7286
        
         matrix-api-async = callPackage ../development/python-modules/matrix-api-async { };

     
···

       7672
       7678
        
         molecule = callPackage ../development/python-modules/molecule { };

     

       7673
       7679
        
       

     

       7674
       7680
        
         molecule-plugins = callPackage ../development/python-modules/molecule/plugins.nix { };

     

       7681
       7681
       +
       

     

       7682
       7682
       +
         momepy = callPackage ../development/python-modules/momepy { };

     

       7675
       7683
        
       

     

       7676
       7684
        
         monai = callPackage ../development/python-modules/monai { };

     

       7677
       7685
        
       

     
···

       8647
       8655
        
         natasha = callPackage ../development/python-modules/natasha { };

     

       8648
       8656
        
       

     

       8649
       8657
        
         nomadnet = callPackage ../development/python-modules/nomadnet { };

     

       8658
       8658
       +
       

     

       8659
       8659
       +
         noneprompt = callPackage ../development/python-modules/noneprompt {  };

     

       8650
       8660
        
       

     

       8651
       8661
        
         nox = callPackage ../development/python-modules/nox { };

     

       8652
       8662