commit 3dbb87768aec8658f60c4ca624fa92201258bd8f · pyrox.dev/nixpkgs

+1 -1

maintainers/maintainer-list.nix

···

       10752
       10752
        
           name = "Jeffrey David Johnson";

     

       10753
       10753
        
         };

     

       10754
       10754
        
         jefflabonte = {

     

       10755
       10755
       -
           email = "grimsleepless@protonmail.com";

     

       10755
       10755
       +
           email = "jean-francois.labonte@brightonlabs.ai";

     

       10756
       10756
        
           github = "JeffLabonte";

     

       10757
       10757
        
           githubId = 9425955;

     

       10758
       10758
        
           name = "Jean-François Labonté";

+9 -8

pkgs/applications/editors/vscode/vscode.nix

···

       36
       36
        
       

     

       37
       37
        
         sha256 =

     

       38
       38
        
           {

     

       39
       39
       -
             x86_64-linux = "0a4siy3is9bzbzmhhaf4l2djabv1yxjb20yp48i094wk0lpwbgcm";

     

       40
       40
       -
             x86_64-darwin = "1pdx07ibylfk8zx71cjfjmsd8650kpd8rvkknixg1nm1jar9zsb3";

     

       41
       41
       -
             aarch64-linux = "0x2qg7ixgkq637qvd218zk8ykfq97l55az17fqgp9dm9g73xn85f";

     

       42
       42
       -
             aarch64-darwin = "0jlfkkc99wv875n2h5v3lnyhjhh74w53yd07jp02fbg4hs8sds92";

     

       43
       43
       -
             armv7l-linux = "13a7s1il860g7v41wwdac3zdawc9w0bkrg9yif99s5ll0nakfs88";

     

       39
       39
       +
             x86_64-linux = "0gr2z4vzms6fv4kcc8dzc7l3inpb5hasnzdfr1zc2n4i3nl8z8vw";

     

       40
       40
       +
             x86_64-darwin = "1qplpjazjds5kns0kmp5qa6zfix30cqa93bl4bcpvblb2x9fh1v8";

     

       41
       41
       +
             aarch64-linux = "1jhrmwrnxzwvhqgfrs35kyd5hhg2b7dyq3p5k88jhm8607nkds79";

     

       42
       42
       +
             aarch64-darwin = "072lg4nvq3cdjzrwngaxnz9p952zkxsknsb39zjh55vzrij55g9x";

     

       43
       43
       +
             armv7l-linux = "06bvh72bq4ippr2k8ifcfqhkhhh6na4vxsz1k50swr1k2kzwwr5d";

     

       44
       44
        
           }

     

       45
       45
        
           .${system} or throwSystem;

     

       46
       46
        
       in

     

       47
       47
        
       callPackage ./generic.nix rec {

     

       48
       48
        
         # Please backport all compatible updates to the stable release.

     

       49
       49
        
         # This is important for the extension ecosystem.

     

       50
       50
       -
         version = "1.97.0";

     

       50
       50
       +
         version = "1.97.1";

     

       51
       51
        
         pname = "vscode" + lib.optionalString isInsiders "-insiders";

     

       52
       52
        
       

     

       53
       53
        
         # This is used for VS Code - Remote SSH test

     

       54
       54
       -
         rev = "33fc5a94a3f99ebe7087e8fe79fbe1d37a251016";

     

       54
       54
       +
         rev = "e249dada235c2083c83813bd65b7f4707fb97b76";

     

       55
       55
        
       

     

       56
       56
        
         executableName = "code" + lib.optionalString isInsiders "-insiders";

     

       57
       57
        
         longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";

     
···

       75
       75
        
           src = fetchurl {

     

       76
       76
        
             name = "vscode-server-${rev}.tar.gz";

     

       77
       77
        
             url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";

     

       78
       78
       -
             sha256 = "1vqqrcyrb8kigdwap5rkpil8lrahngix16hyqpvsmf0gsyjh46h0";

     

       78
       78
       +
             sha256 = "01snzahh794ygpgwh4r57c8mnisp6a4fc3v5x76cdhxw2hd9s26n";

     

       79
       79
        
           };

     

       80
       80
        
           stdenv = stdenvNoCC;

     

       81
       81
        
         };

     
···

       110
       110
        
             synthetica

     

       111
       111
        
             bobby285271

     

       112
       112
        
             johnrtitor

     

       113
       113
       +
             jefflabonte

     

       113
       114
        
           ];

     

       114
       115
        
           platforms = [

     

       115
       116
        
             "x86_64-linux"

+3 -3

pkgs/by-name/co/containerlab/package.nix

···

       7
       7
        
       

     

       8
       8
        
       buildGoModule rec {

     

       9
       9
        
         pname = "containerlab";

     

       10
       10
       -
         version = "0.62.2";

     

       10
       10
       +
         version = "0.64.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "srl-labs";

     

       14
       14
        
           repo = "containerlab";

     

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

     

       16
       16
       -
           hash = "sha256-RUe/IHHhZKbxtNVxiS29/OPvpCCOzaz2d5Qh3vVll3U=";

     

       16
       16
       +
           hash = "sha256-ijqylVQKt7N3rc+HVc34XfU3LMXAtn+mhVWIzZZIikw=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         vendorHash = "sha256-G9W4iC04R5Rvl3hAJtMlUKJKo7AAIE33Y2c+0HedXU8=";

     

       19
       19
       +
         vendorHash = "sha256-9p4J9qkIQCubn3W4b3qNHfq1M2kMiqG0eGFaBxGdrAk=";

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ installShellFiles ];

     

       22
       22

+16 -19

pkgs/by-name/de/deeptools/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         python3,

     

       3
       3
       +
         python3Packages,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         addBinToPathHook,

     

       5
       6
        
       }:

     

       6
       7
        
       

     

       7
       7
       -
       python3.pkgs.buildPythonApplication rec {

     

       8
       8
       +
       python3Packages.buildPythonApplication rec {

     

       8
       9
        
         pname = "deeptools";

     

       9
       9
       -
         version = "3.5.5";

     

       10
       10
       +
         version = "3.5.6";

     

       10
       11
        
         pyproject = true;

     

       11
       12
        
       

     

       12
       13
        
         src = fetchFromGitHub {

     

       13
       14
        
           owner = "deeptools";

     

       14
       15
        
           repo = "deepTools";

     

       15
       16
        
           tag = version;

     

       16
       16
       -
           hash = "sha256-2kSlL7Y5f/FjVtStnmz+GlTw2oymrtxOCaXlqgbQ7FU=";

     

       17
       17
       +
           hash = "sha256-dxXlOvOjF4KSc5YO+1A5hlp95sfeyPSbmp93tihm7Vo=";

     

       17
       18
        
         };

     

       18
       19
        
       

     

       19
       19
       -
         nativeBuildInputs = with python3.pkgs; [

     

       20
       20
       +
         build-system = with python3Packages; [

     

       20
       21
        
           setuptools

     

       21
       22
        
         ];

     

       22
       23
        
       

     

       23
       23
       -
         propagatedBuildInputs = with python3.pkgs; [

     

       24
       24
       +
         dependencies = with python3Packages; [

     

       24
       25
        
           numpy

     

       26
       26
       +
           scipy

     

       27
       27
       +
           matplotlib

     

       28
       28
       +
           pysam

     

       25
       29
        
           numpydoc

     

       26
       26
       -
           scipy

     

       30
       30
       +
           pybigwig

     

       27
       31
        
           py2bit

     

       28
       28
       -
           pybigwig

     

       29
       29
       -
           pysam

     

       30
       30
       -
           matplotlib

     

       31
       32
        
           plotly

     

       32
       33
        
           deeptoolsintervals

     

       33
       33
       -
           importlib-metadata

     

       34
       34
        
         ];

     

       35
       35
        
       

     

       36
       36
       -
         nativeCheckInputs = with python3.pkgs; [

     

       36
       36
       +
         nativeCheckInputs = with python3Packages; [

     

       37
       37
        
           pytestCheckHook

     

       38
       38
       +
           addBinToPathHook

     

       38
       39
        
         ];

     

       39
       40
        
       

     

       40
       40
       -
         preCheck = ''

     

       41
       41
       -
           export PATH="$out/bin:$PATH"

     

       42
       42
       -
         '';

     

       43
       43
       -
       

     

       44
       41
        
         disabledTestPaths = [

     

       45
       42
        
           # tests trip on `len(sys.argv) == 1`

     

       46
       43
        
           "deeptools/test/test_bigwigAverage.py"

     
···

       49
       46
        
           "deeptools/test/test_multiBamSummary.py"

     

       50
       47
        
         ];

     

       51
       48
        
       

     

       52
       52
       -
         meta = with lib; {

     

       49
       49
       +
         meta = {

     

       53
       50
        
           homepage = "https://deeptools.readthedocs.io/en/develop";

     

       54
       51
        
           description = "Tools for exploring deep DNA sequencing data";

     

       55
       52
        
           longDescription = ''

     
···

       60
       57
        
             publication-ready visualizations to identify enrichments and for functional

     

       61
       58
        
             annotations of the genome.

     

       62
       59
        
           '';

     

       63
       63
       -
           license = with licenses; [

     

       60
       60
       +
           license = with lib.licenses; [

     

       64
       61
        
             mit

     

       65
       62
        
             bsd3

     

       66
       63
        
           ];

     

       67
       67
       -
           maintainers = with maintainers; [ scalavision ];

     

       64
       64
       +
           maintainers = with lib.maintainers; [ scalavision ];

     

       68
       65
        
         };

     

       69
       66
        
       }

+1 -1

pkgs/by-name/de/desktop-file-utils/package.nix

···

       38
       38
        
         meta = with lib; {

     

       39
       39
        
           homepage = "https://www.freedesktop.org/wiki/Software/desktop-file-utils";

     

       40
       40
        
           description = "Command line utilities for working with .desktop files";

     

       41
       41
       -
           platforms = platforms.linux ++ platforms.darwin;

     

       41
       41
       +
           platforms = platforms.linux ++ platforms.darwin ++ platforms.freebsd;

     

       42
       42
        
           license = licenses.gpl2Plus;

     

       43
       43
        
         };

     

       44
       44
        
       }

+11 -11

pkgs/by-name/go/google-amber/package.nix

···

       18
       18
        
         glslang = fetchFromGitHub {

     

       19
       19
        
           owner = "KhronosGroup";

     

       20
       20
        
           repo = "glslang";

     

       21
       21
       -
           rev = "e8dd0b6903b34f1879520b444634c75ea2deedf5";

     

       22
       22
       -
           hash = "sha256-B6jVCeoFjd2H6+7tIses+Kj8DgHS6E2dkVzQAIzDHEc=";

     

       21
       21
       +
           rev = "340bf88f3fdb4f4a25b7071cd2c1205035fc6eaa";

     

       22
       22
       +
           hash = "sha256-3h27yE6k4BgUAugQCkpUYO5aIHpK6Anyh90y3q+aYpM=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         lodepng = fetchFromGitHub {

     
···

       32
       32
        
         shaderc = fetchFromGitHub {

     

       33
       33
        
           owner = "google";

     

       34
       34
        
           repo = "shaderc";

     

       35
       35
       -
           rev = "f59f0d11b80fd622383199c867137ededf89d43b";

     

       36
       36
       -
           hash = "sha256-kHz8Io5GZDWv1FjPyBWRpnKhGygKhSU4L9zl/AKXZlU=";

     

       35
       35
       +
           rev = "690d259384193c90c01b52288e280b05a8481121";

     

       36
       36
       +
           hash = "sha256-p4tP/8lRy0tpdDHIuh2/tWPIBBr2ludFRSr+Q2TbUic=";

     

       37
       37
        
         };

     

       38
       38
        
       

     

       39
       39
        
         spirv-headers = fetchFromGitHub {

     

       40
       40
        
           owner = "KhronosGroup";

     

       41
       41
        
           repo = "SPIRV-Headers";

     

       42
       42
       -
           rev = "5e3ad389ee56fca27c9705d093ae5387ce404df4";

     

       43
       43
       -
           hash = "sha256-gjF5mVTXqU/GZzr2S6oKGChgvqqHcQSrEq/ePP2yJys=";

     

       42
       42
       +
           rev = "3f17b2af6784bfa2c5aa5dbb8e0e74a607dd8b3b";

     

       43
       43
       +
           hash = "sha256-MCQ+i9ymjnxRZP/Agk7rOGdHcB4p67jT4J4athWUlcI=";

     

       44
       44
        
         };

     

       45
       45
        
       

     

       46
       46
        
         spirv-tools = fetchFromGitHub {

     

       47
       47
        
           owner = "KhronosGroup";

     

       48
       48
        
           repo = "SPIRV-Tools";

     

       49
       49
       -
           rev = "9241a58a8028c49510bc174b6c970e3c2b4b8e51";

     

       50
       50
       -
           hash = "sha256-0qHUpwNDJI2jV4h68QaTNPIwTPxwTt0iAUnMXqFCiJE=";

     

       49
       49
       +
           rev = "13b59bf1d84054b8ccd29cdc6b1303f69e8f9e77";

     

       50
       50
       +
           hash = "sha256-k/mTHiLbZdnslC24fjcrzqsZYMyVaAADGEqngqJcC2c=";

     

       51
       51
        
         };

     

       52
       52
        
       

     

       53
       53
        
       in

     

       54
       54
        
       stdenv.mkDerivation (finalAttrs: {

     

       55
       55
        
         pname = "amber";

     

       56
       56
       -
         version = "unstable-2024-08-21";

     

       56
       56
       +
         version = "unstable-2025-02-03";

     

       57
       57
        
       

     

       58
       58
        
         src = fetchFromGitHub {

     

       59
       59
        
           owner = "google";

     

       60
       60
        
           repo = "amber";

     

       61
       61
       -
           rev = "66399a35927606a435bf7a59756e87e6cb5a0013";

     

       62
       62
       -
           hash = "sha256-PCO64zI/vzp4HyGz5WpeYpCBeaWjTvz1punWsTz1yiM=";

     

       61
       61
       +
           rev = "3f078e41d86ca1a5881560f00e26198f59bb8ac0";

     

       62
       62
       +
           hash = "sha256-pAotVFmtEGp9GKmDD0vrbfbO+Xt2URmM8gYCjl0LEnk=";

     

       63
       63
        
         };

     

       64
       64
        
       

     

       65
       65
        
         buildInputs = [

+3 -3

pkgs/by-name/pu/pulldown-cmark/package.nix

···

       6
       6
        
       

     

       7
       7
        
       rustPlatform.buildRustPackage rec {

     

       8
       8
        
         pname = "pulldown-cmark";

     

       9
       9
       -
         version = "0.12.2";

     

       9
       9
       +
         version = "0.13.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchCrate {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           hash = "sha256-dsSt0JC3e1IItyY16tosxD83XUdttHVIT40QsW9iUFU=";

     

       13
       13
       +
           hash = "sha256-lp0ywX/3phfC30QvYkO2wFZNSinP4cdm4HY744EZ02o=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         useFetchCargoVendor = true;

     

       17
       17
       -
         cargoHash = "sha256-5AXEXuw3aKT8ghzEclwZYSOQvKcy90OvZbAVVkNJq1U=";

     

       17
       17
       +
         cargoHash = "sha256-ek6Eczqb/kxxoZFakGcwrgqXAtNCtQxDX2PHdOcIUjU=";

     

       18
       18
        
       

     

       19
       19
        
         meta = {

     

       20
       20
        
           description = "Pull parser for CommonMark written in Rust";

+18 -4

pkgs/by-name/wy/wyoming-satellite/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         python3Packages,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         fetchpatch2,

     

       5
       6
        
       }:

     

       6
       7
        
       

     

       7
       8
        
       let

     
···

       21
       22
        
       in

     

       22
       23
        
       python.pkgs.buildPythonApplication rec {

     

       23
       24
        
         pname = "wyoming-satellite";

     

       24
       24
       -
         version = "1.3.0";

     

       25
       25
       +
         version = "1.4.1";

     

       25
       26
        
         pyproject = true;

     

       26
       27
        
       

     

       27
       28
        
         src = fetchFromGitHub {

     

       28
       29
        
           owner = "rhasspy";

     

       29
       30
        
           repo = "wyoming-satellite";

     

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

     

       31
       31
       -
           hash = "sha256-9UgfD0Hs/IgOszd/QBbe6DYY6kBWh7q/e57gghQ1/Bk=";

     

       32
       32
       +
           hash = "sha256-sAtyyS60Fr6iFE3tTxEgAjhmX6O5WjWwb9rk+phzrtM=";

     

       32
       33
        
         };

     

       33
       34
        
       

     

       35
       35
       +
         patches = [

     

       36
       36
       +
           (fetchpatch2 {

     

       37
       37
       +
             # https://github.com/rhasspy/wyoming-satellite/pull/285

     

       38
       38
       +
             url = "https://github.com/rhasspy/wyoming-satellite/commit/69465fd56011179cb92e7ce95da2e79fb06a83fb.patch";

     

       39
       39
       +
             hash = "sha256-njJ8kIVGOpYK6bDeGow3OSNHxKQ9NsUKAR3+lEUH3GE=";

     

       40
       40
       +
           })

     

       41
       41
       +
         ];

     

       42
       42
       +
       

     

       34
       43
        
         build-system = with python.pkgs; [

     

       35
       44
        
           setuptools

     

       36
       45
        
         ];

     
···

       46
       55
        
           zeroconf

     

       47
       56
        
         ];

     

       48
       57
        
       

     

       49
       49
       -
         optional-dependencies = {

     

       58
       58
       +
         optional-dependencies = lib.fix (self: {

     

       59
       59
       +
           all = self.silerovad ++ self.webrtc;

     

       60
       60
       +
           respeaker = with python3Packages; [

     

       61
       61
       +
             gpiozero

     

       62
       62
       +
             spidev

     

       63
       63
       +
           ];

     

       50
       64
        
           silerovad = with python3Packages; [

     

       51
       65
        
             pysilero-vad

     

       52
       66
        
           ];

     

       53
       67
        
           webrtc = with python3Packages; [

     

       54
       68
        
             webrtc-noise-gain

     

       55
       69
        
           ];

     

       56
       56
       -
         };

     

       70
       70
       +
         });

     

       57
       71
        
       

     

       58
       72
        
         pythonImportsCheck = [

     

       59
       73
        
           "wyoming_satellite"

-45

pkgs/development/interpreters/python/cpython/3.12/CVE-2024-12254.patch

···

       1
       1
       -
       From e991ac8f2037d78140e417cc9a9486223eb3e786 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: "J. Nick Koston" <nick@koston.org>

     

       3
       3
       -
       Date: Thu, 5 Dec 2024 22:33:03 -0600

     

       4
       4
       -
       Subject: [PATCH] gh-127655: Ensure `_SelectorSocketTransport.writelines`

     

       5
       5
       -
        pauses the protocol if needed (#127656)

     

       6
       6
       -
       

     

       7
       7
       -
       Ensure `_SelectorSocketTransport.writelines` pauses the protocol if it reaches the high water mark as needed.

     

       8
       8
       -
       

     

       9
       9
       -
       Co-authored-by: Kumar Aditya <kumaraditya@python.org>

     

       10
       10
       -
       

     

       11
       11
       -
       diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py

     

       12
       12
       -
       index f94bf10b4225e7..f1ab9b12d69a5d 100644

     

       13
       13
       -
       --- a/Lib/asyncio/selector_events.py

     

       14
       14
       -
       +++ b/Lib/asyncio/selector_events.py

     

       15
       15
       -
       @@ -1175,6 +1175,7 @@ def writelines(self, list_of_data):

     

       16
       16
       -
                # If the entire buffer couldn't be written, register a write handler

     

       17
       17
       -
                if self._buffer:

     

       18
       18
       -
                    self._loop._add_writer(self._sock_fd, self._write_ready)

     

       19
       19
       -
       +            self._maybe_pause_protocol()

     

       20
       20
       -
        

     

       21
       21
       -
            def can_write_eof(self):

     

       22
       22
       -
                return True

     

       23
       23
       -
       diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py

     

       24
       24
       -
       index aaeda33dd0c677..efca30f37414f9 100644

     

       25
       25
       -
       --- a/Lib/test/test_asyncio/test_selector_events.py

     

       26
       26
       -
       +++ b/Lib/test/test_asyncio/test_selector_events.py

     

       27
       27
       -
       @@ -805,6 +805,18 @@ def test_writelines_send_partial(self):

     

       28
       28
       -
                self.assertTrue(self.sock.send.called)

     

       29
       29
       -
                self.assertTrue(self.loop.writers)

     

       30
       30
       -
        

     

       31
       31
       -
       +    def test_writelines_pauses_protocol(self):

     

       32
       32
       -
       +        data = memoryview(b'data')

     

       33
       33
       -
       +        self.sock.send.return_value = 2

     

       34
       34
       -
       +        self.sock.send.fileno.return_value = 7

     

       35
       35
       -
       +

     

       36
       36
       -
       +        transport = self.socket_transport()

     

       37
       37
       -
       +        transport._high_water = 1

     

       38
       38
       -
       +        transport.writelines([data])

     

       39
       39
       -
       +        self.assertTrue(self.protocol.pause_writing.called)

     

       40
       40
       -
       +        self.assertTrue(self.sock.send.called)

     

       41
       41
       -
       +        self.assertTrue(self.loop.writers)

     

       42
       42
       -
       +

     

       43
       43
       -
            @unittest.skipUnless(selector_events._HAS_SENDMSG, 'no sendmsg')

     

       44
       44
       -
            def test_write_sendmsg_full(self):

     

       45
       45
       -
                data = memoryview(b'data')

+1 -3

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

···

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

     

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

     

       256
       256
        
           noldconfigPatch

     

       257
       257
       -
         ] ++ optionals (!isPy312 && !isPy313) [

     

       257
       257
       +
         ] ++ optionals (pythonOlder "3.12") [

     

       258
       258
        
           # https://www.cve.org/CVERecord?id=CVE-2025-0938

     

       259
       259
        
           ./CVE-2025-0938.patch

     

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

     
···

       299
       299
        
         ] ++ optionals (pythonOlder "3.12") [

     

       300
       300
        
           # https://github.com/python/cpython/issues/90656

     

       301
       301
        
           ./loongarch-support.patch

     

       302
       302
       -
         ] ++ optionals isPy314 [

     

       303
       303
       -
           ./3.12/CVE-2024-12254.patch

     

       304
       302
        
         ] ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.13") [

     

       305
       303
        
           # backport fix for https://github.com/python/cpython/issues/95855

     

       306
       304
        
           ./platform-triplet-detection.patch

+2 -2

pkgs/development/interpreters/python/default.nix

···

       100
       100
        
             major = "3";

     

       101
       101
        
             minor = "14";

     

       102
       102
        
             patch = "0";

     

       103
       103
       -
             suffix = "a4";

     

       103
       103
       +
             suffix = "a5";

     

       104
       104
        
           };

     

       105
       105
       -
           hash = "sha256-wk8HiBhzwdRgIoeVymyoyZEw4wx3PJFGPTDX6o/w5ws=";

     

       105
       105
       +
           hash = "sha256-dOg/Jt4eT7nu8bVkks/5JQiDS7cawT9cWAQ4zp8JNoI=";

     

       106
       106
        
           inherit passthruFun;

     

       107
       107
        
         };

     

       108
       108
        
         # Minimal versions of Python (built without optional dependencies)

+2 -2

pkgs/development/python-modules/awkward-cpp/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "awkward-cpp";

     

       14
       14
       -
         version = "43";

     

       14
       14
       +
         version = "44";

     

       15
       15
        
         pyproject = true;

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           pname = "awkward_cpp";

     

       19
       19
        
           inherit version;

     

       20
       20
       -
           hash = "sha256-we11WW7IKvZm2ghLW/gF2bcsg1MtA10rZeB5WQXSXq0=";

     

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

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         build-system = [

+29 -20

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       +
         stdenv,

     

       3
       4
        
         buildPythonPackage,

     

       4
       4
       -
         pythonOlder,

     

       5
       5
        
         fetchFromGitHub,

     

       6
       6
        
       

     

       7
       7
        
         # build-system

     
···

       13
       13
        
         fsspec,

     

       14
       14
        
         numpy,

     

       15
       15
        
         packaging,

     

       16
       16
       -
         typing-extensions,

     

       17
       17
       -
         importlib-metadata,

     

       18
       16
        
       

     

       19
       19
       -
         # checks

     

       17
       17
       +
         # tests

     

       20
       18
        
         numba,

     

       21
       21
       -
         setuptools,

     

       22
       19
        
         numexpr,

     

       23
       20
        
         pandas,

     

       24
       21
        
         pyarrow,

     
···

       28
       25
        
       

     

       29
       26
        
       buildPythonPackage rec {

     

       30
       27
        
         pname = "awkward";

     

       31
       31
       -
         version = "2.7.2";

     

       28
       28
       +
         version = "2.7.4";

     

       32
       29
        
         pyproject = true;

     

       33
       30
        
       

     

       34
       31
        
         src = fetchFromGitHub {

     

       35
       32
        
           owner = "scikit-hep";

     

       36
       33
        
           repo = "awkward";

     

       37
       34
        
           tag = "v${version}";

     

       38
       38
       -
           hash = "sha256-nOKMwAQ5t8tc64bEKz0j8JxxoVQQu39Iu8Zr9cqSx7A=";

     

       35
       35
       +
           hash = "sha256-OXSl+8sfrx+JlLu40wHf+98WVNNwm9uxvsnGXRDztDg=";

     

       39
       36
        
         };

     

       40
       37
        
       

     

       41
       38
        
         build-system = [

     
···

       43
       40
        
           hatchling

     

       44
       41
        
         ];

     

       45
       42
        
       

     

       46
       46
       -
         dependencies =

     

       47
       47
       -
           [

     

       48
       48
       -
             awkward-cpp

     

       49
       49
       -
             fsspec

     

       50
       50
       -
             numpy

     

       51
       51
       -
             packaging

     

       52
       52
       -
           ]

     

       53
       53
       -
           ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]

     

       54
       54
       -
           ++ lib.optionals (pythonOlder "3.12") [ importlib-metadata ];

     

       43
       43
       +
         dependencies = [

     

       44
       44
       +
           awkward-cpp

     

       45
       45
       +
           fsspec

     

       46
       46
       +
           numpy

     

       47
       47
       +
           packaging

     

       48
       48
       +
         ];

     

       55
       49
        
       

     

       56
       50
        
         dontUseCmakeConfigure = true;

     

       57
       51
        
       

     
···

       60
       54
        
         nativeCheckInputs = [

     

       61
       55
        
           fsspec

     

       62
       56
        
           numba

     

       63
       63
       -
           setuptools

     

       64
       57
        
           numexpr

     

       65
       58
        
           pandas

     

       66
       59
        
           pyarrow

     
···

       68
       61
        
           pytestCheckHook

     

       69
       62
        
         ];

     

       70
       63
        
       

     

       71
       71
       -
         disabledTestPaths = [

     

       72
       72
       -
           # Need to be run on a GPU platform.

     

       73
       73
       -
           "tests-cuda"

     

       64
       64
       +
         disabledTests = [

     

       65
       65
       +
           # pyarrow.lib.ArrowInvalid

     

       66
       66
       +
           "test_recordarray"

     

       74
       67
        
         ];

     

       68
       68
       +
       

     

       69
       69
       +
         disabledTestPaths =

     

       70
       70
       +
           [

     

       71
       71
       +
             # Need to be run on a GPU platform.

     

       72
       72
       +
             "tests-cuda"

     

       73
       73
       +
           ]

     

       74
       74
       +
           ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [

     

       75
       75
       +
             # Fatal Python error: Segmentation fault at:

     

       76
       76
       +
             # numba/typed/typedlist.py", line 344 in append

     

       77
       77
       +
             "tests/test_0118_numba_cpointers.py"

     

       78
       78
       +
             "tests/test_0397_arrays_as_constants_in_numba.py"

     

       79
       79
       +
             "tests/test_1677_array_builder_in_numba.py"

     

       80
       80
       +
             "tests/test_2055_array_builder_check.py"

     

       81
       81
       +
             "tests/test_2349_growablebuffer_in_numba.py"

     

       82
       82
       +
             "tests/test_2408_layoutbuilder_in_numba.py"

     

       83
       83
       +
           ];

     

       75
       84
        
       

     

       76
       85
        
         meta = {

     

       77
       86
        
           description = "Manipulate JSON-like data with NumPy-like idioms";

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

···

       57
       57
        
           hatch-vcs

     

       58
       58
        
         ];

     

       59
       59
        
       

     

       60
       60
       +
         pythonRelaxDeps = [

     

       61
       61
       +
           "dask"

     

       62
       62
       +
         ];

     

       63
       63
       +
       

     

       60
       64
        
         dependencies = [

     

       61
       65
        
           aiohttp

     

       62
       66
        
           awkward

     
···

       106
       110
        
           # AssertionError: bug in Awkward Array: attempt to convert TypeTracerArray into a concrete array

     

       107
       111
        
           "test_apply_to_fileset"

     

       108
       112
        
           "test_lorentz_behavior"

     

       113
       113
       +
       

     

       114
       114
       +
           # ValueError: The array to mask was deleted before it could be masked.

     

       115
       115
       +
           # If you want to construct this mask, you must either keep the array alive or use 'ak.mask' explicitly.

     

       116
       116
       +
           "test_read_nanomc"

     

       109
       117
        
         ];

     

       110
       118
        
       

     

       111
       119
        
         __darwinAllowLocalNetworking = true;

+6 -6

pkgs/development/python-modules/dask-awkward/default.nix

···

       16
       16
        
         # optional-dependencies

     

       17
       17
        
         pyarrow,

     

       18
       18
        
       

     

       19
       19
       -
         # checks

     

       19
       19
       +
         # tests

     

       20
       20
        
         dask-histogram,

     

       21
       21
        
         distributed,

     

       22
       22
        
         hist,

     
···

       27
       27
        
       

     

       28
       28
        
       buildPythonPackage rec {

     

       29
       29
        
         pname = "dask-awkward";

     

       30
       30
       -
         version = "2024.12.2";

     

       30
       30
       +
         version = "2025.2.0";

     

       31
       31
        
         pyproject = true;

     

       32
       32
        
       

     

       33
       33
        
         src = fetchFromGitHub {

     

       34
       34
        
           owner = "dask-contrib";

     

       35
       35
        
           repo = "dask-awkward";

     

       36
       36
        
           tag = version;

     

       37
       37
       -
           hash = "sha256-pL1LDW/q78V/c3Bha38k40018MFO+i8X6htYNdcsy7s=";

     

       37
       37
       +
           hash = "sha256-hhAY2cPUOYnP86FGsLvxlMeoEwY+sTrjPMKyuZrO0/M=";

     

       38
       38
        
         };

     

       39
       39
        
       

     

       40
       40
        
         build-system = [

     
···

       53
       53
        
           io = [ pyarrow ];

     

       54
       54
        
         };

     

       55
       55
        
       

     

       56
       56
       -
         checkInputs = [

     

       57
       57
       -
           dask-histogram

     

       56
       56
       +
         nativeCheckInputs = [

     

       57
       57
       +
           # dask-histogram (circular dependency)

     

       58
       58
        
           distributed

     

       59
       59
        
           hist

     

       60
       60
        
           pandas

     
···

       86
       86
        
         meta = {

     

       87
       87
        
           description = "Native Dask collection for awkward arrays, and the library to use it";

     

       88
       88
        
           homepage = "https://github.com/dask-contrib/dask-awkward";

     

       89
       89
       -
           changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${src.tag}";

     

       89
       89
       +
           changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${version}";

     

       90
       90
        
           license = lib.licenses.bsd3;

     

       91
       91
        
           maintainers = with lib.maintainers; [ veprbl ];

     

       92
       92
        
         };

-65

pkgs/development/python-modules/dask-expr/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         buildPythonPackage,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
       

     

       6
       6
       -
         # build-system

     

       7
       7
       -
         setuptools,

     

       8
       8
       -
         versioneer,

     

       9
       9
       -
       

     

       10
       10
       -
         # dependencies

     

       11
       11
       -
         dask,

     

       12
       12
       -
         pandas,

     

       13
       13
       -
         pyarrow,

     

       14
       14
       -
       

     

       15
       15
       -
         # checks

     

       16
       16
       -
         jinja2,

     

       17
       17
       -
         pytestCheckHook,

     

       18
       18
       -
         xarray,

     

       19
       19
       -
       }:

     

       20
       20
       -
       

     

       21
       21
       -
       buildPythonPackage rec {

     

       22
       22
       -
         pname = "dask-expr";

     

       23
       23
       -
         version = "1.1.21";

     

       24
       24
       -
         pyproject = true;

     

       25
       25
       -
       

     

       26
       26
       -
         src = fetchFromGitHub {

     

       27
       27
       -
           owner = "dask";

     

       28
       28
       -
           repo = "dask-expr";

     

       29
       29
       -
           tag = "v${version}";

     

       30
       30
       -
           hash = "sha256-t1vPlTxV5JYArg/a7CzPP13NHbstEoCgHRmd8Y9mDfA=";

     

       31
       31
       -
         };

     

       32
       32
       -
       

     

       33
       33
       -
         postPatch = ''

     

       34
       34
       -
           substituteInPlace pyproject.toml \

     

       35
       35
       -
             --replace-fail "versioneer[toml]==0.28" "versioneer[toml]"

     

       36
       36
       -
         '';

     

       37
       37
       -
       

     

       38
       38
       -
         build-system = [

     

       39
       39
       -
           setuptools

     

       40
       40
       -
           versioneer

     

       41
       41
       -
         ];

     

       42
       42
       -
       

     

       43
       43
       -
         dependencies = [

     

       44
       44
       -
           dask

     

       45
       45
       -
           pandas

     

       46
       46
       -
           pyarrow

     

       47
       47
       -
         ];

     

       48
       48
       -
       

     

       49
       49
       -
         pythonImportsCheck = [ "dask_expr" ];

     

       50
       50
       -
       

     

       51
       51
       -
         nativeCheckInputs = [

     

       52
       52
       -
           jinja2

     

       53
       53
       -
           pytestCheckHook

     

       54
       54
       -
           xarray

     

       55
       55
       -
         ];

     

       56
       56
       -
       

     

       57
       57
       -
         __darwinAllowLocalNetworking = true;

     

       58
       58
       -
       

     

       59
       59
       -
         meta = {

     

       60
       60
       -
           description = "Rewrite of Dask DataFrame that includes query optimization and generally improved organization";

     

       61
       61
       -
           homepage = "https://github.com/dask/dask-expr";

     

       62
       62
       -
           license = lib.licenses.bsd3;

     

       63
       63
       -
           maintainers = with lib.maintainers; [ GaetanLepage ];

     

       64
       64
       -
         };

     

       65
       65
       -
       }

+32 -26

pkgs/development/python-modules/dask-glm/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
       

     

       6
       6
       +
         # build-system

     

       7
       7
       +
         setuptools-scm,

     

       8
       8
       +
       

     

       9
       9
       +
         # dependencies

     

       4
       10
        
         cloudpickle,

     

       5
       5
       -
         dask,

     

       6
       11
        
         distributed,

     

       7
       7
       -
         fetchPypi,

     

       8
       12
        
         multipledispatch,

     

       9
       9
       -
         pytestCheckHook,

     

       10
       10
       -
         pythonOlder,

     

       11
       13
        
         scikit-learn,

     

       12
       14
        
         scipy,

     

       13
       13
       -
         setuptools-scm,

     

       14
       15
        
         sparse,

     

       16
       16
       +
         dask,

     

       17
       17
       +
       

     

       18
       18
       +
         # tests

     

       19
       19
       +
         pytest-xdist,

     

       20
       20
       +
         pytestCheckHook,

     

       15
       21
        
       }:

     

       16
       22
        
       

     

       17
       23
        
       buildPythonPackage rec {

     

       18
       24
        
         pname = "dask-glm";

     

       19
       25
        
         version = "0.3.2";

     

       20
       20
       -
         format = "setuptools";

     

       26
       26
       +
         pyproject = true;

     

       21
       27
        
       

     

       22
       22
       -
         disabled = pythonOlder "3.7";

     

       23
       23
       -
       

     

       24
       24
       -
         src = fetchPypi {

     

       25
       25
       -
           inherit pname version;

     

       26
       26
       -
           hash = "sha256-yUelZoZmmKAdeZeK5zIzy16DitXq1ghRQ1gsXpMLmko=";

     

       28
       28
       +
         src = fetchFromGitHub {

     

       29
       29
       +
           owner = "dask";

     

       30
       30
       +
           repo = "dask-glm";

     

       31
       31
       +
           tag = version;

     

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

     

       27
       33
        
         };

     

       28
       34
        
       

     

       29
       29
       -
         nativeBuildInputs = [ setuptools-scm ];

     

       35
       35
       +
         # ValueError: The truth value of an empty array is ambiguous. Use `array.size > 0` to check that an array is not empty.

     

       36
       36
       +
         postPatch = ''

     

       37
       37
       +
           substituteInPlace dask_glm/utils.py \

     

       38
       38
       +
             --replace-fail "if arr:" "if (arr is not None) and (arr.size > 0):"

     

       39
       39
       +
         '';

     

       30
       40
        
       

     

       31
       31
       -
         propagatedBuildInputs = [

     

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

     

       42
       42
       +
       

     

       43
       43
       +
         dependencies = [

     

       32
       44
        
           cloudpickle

     

       33
       45
        
           distributed

     

       34
       46
        
           multipledispatch

     
···

       38
       50
        
         ] ++ dask.optional-dependencies.array;

     

       39
       51
        
       

     

       40
       52
        
         nativeCheckInputs = [

     

       41
       41
       -
           sparse

     

       53
       53
       +
           pytest-xdist

     

       42
       54
        
           pytestCheckHook

     

       43
       55
        
         ];

     

       44
       56
        
       

     

       45
       57
        
         pythonImportsCheck = [ "dask_glm" ];

     

       46
       58
        
       

     

       47
       47
       -
         disabledTestPaths = [

     

       48
       48
       -
           # Circular dependency with dask-ml

     

       49
       49
       -
           "dask_glm/tests/test_estimators.py"

     

       50
       50
       -
           # Test tries to imort an obsolete method

     

       51
       51
       -
           "dask_glm/tests/test_utils.py"

     

       52
       52
       -
         ];

     

       53
       53
       -
       

     

       54
       59
        
         disabledTests = [

     

       55
       55
       -
           # missing fixture with distributed>=2022.8.0

     

       56
       56
       -
           "test_determinism_distributed"

     

       60
       60
       +
           # ValueError: <class 'bool'> can be computed for one-element arrays only.

     

       61
       61
       +
           "test_dot_with_sparse"

     

       57
       62
        
         ];

     

       58
       63
        
       

     

       59
       64
        
         __darwinAllowLocalNetworking = true;

     

       60
       65
        
       

     

       61
       61
       -
         meta = with lib; {

     

       66
       66
       +
         meta = {

     

       62
       67
        
           description = "Generalized Linear Models with Dask";

     

       63
       68
        
           homepage = "https://github.com/dask/dask-glm/";

     

       64
       64
       -
           license = licenses.bsd3;

     

       65
       65
       -
           maintainers = [ ];

     

       69
       69
       +
           changelog = "https://github.com/dask/dask-glm/releases/tag/${version}";

     

       70
       70
       +
           license = lib.licenses.bsd3;

     

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

     

       66
       72
        
         };

     

       67
       73
        
       }

+5 -3

pkgs/development/python-modules/dask-histogram/default.nix

···

       10
       10
        
         # dependencies

     

       11
       11
        
         boost-histogram,

     

       12
       12
        
         dask,

     

       13
       13
       +
         dask-awkward,

     

       13
       14
        
       

     

       14
       15
        
         # tests

     

       15
       16
        
         pytestCheckHook,

     
···

       17
       18
        
       

     

       18
       19
        
       buildPythonPackage rec {

     

       19
       20
        
         pname = "dask-histogram";

     

       20
       20
       -
         version = "2024.12.1";

     

       21
       21
       +
         version = "2025.2.0";

     

       21
       22
        
         pyproject = true;

     

       22
       23
        
       

     

       23
       24
        
         src = fetchFromGitHub {

     

       24
       25
        
           owner = "dask-contrib";

     

       25
       26
        
           repo = "dask-histogram";

     

       26
       27
        
           tag = version;

     

       27
       27
       -
           hash = "sha256-chznfEsMFuIioIlTz6uNpVAkjMMoMXjS62R4luKxVZQ=";

     

       28
       28
       +
           hash = "sha256-5Ec/qzVc/7LDG6SJym1e76BbxmbVjKKQHckwtTs1+6M=";

     

       28
       29
        
         };

     

       29
       30
        
       

     

       30
       31
        
         build-system = [

     
···

       35
       36
        
         dependencies = [

     

       36
       37
        
           boost-histogram

     

       37
       38
        
           dask

     

       39
       39
       +
           dask-awkward

     

       38
       40
        
         ];

     

       39
       41
        
       

     

       40
       42
        
         nativeCheckInputs = [ pytestCheckHook ];

     
···

       44
       46
        
         meta = {

     

       45
       47
        
           description = "Histograms with task scheduling";

     

       46
       48
        
           homepage = "https://dask-histogram.readthedocs.io/";

     

       47
       47
       -
           changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${src.tag}";

     

       49
       49
       +
           changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${version}";

     

       48
       50
        
           license = with lib.licenses; [ bsd3 ];

     

       49
       51
        
           maintainers = with lib.maintainers; [ veprbl ];

     

       50
       52
        
         };

+24 -3

pkgs/development/python-modules/dask-image/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
       -
         pythonOlder,

     

       5
       4
        
         fetchFromGitHub,

     

       5
       5
       +
       

     

       6
       6
       +
         # build-system

     

       6
       7
        
         setuptools,

     

       7
       8
        
         setuptools-scm,

     

       9
       9
       +
       

     

       10
       10
       +
         # dependencies

     

       8
       11
        
         dask,

     

       9
       12
        
         numpy,

     

       10
       13
        
         scipy,

     

       11
       14
        
         pandas,

     

       12
       15
        
         pims,

     

       16
       16
       +
       

     

       17
       17
       +
         # tests

     

       18
       18
       +
         pyarrow,

     

       13
       19
        
         pytestCheckHook,

     

       14
       20
        
         scikit-image,

     

       15
       21
        
       }:

     
···

       19
       25
        
         version = "2024.5.3";

     

       20
       26
        
         pyproject = true;

     

       21
       27
        
       

     

       22
       22
       -
         disabled = pythonOlder "3.9";

     

       23
       23
       -
       

     

       24
       28
        
         src = fetchFromGitHub {

     

       25
       29
        
           owner = "dask";

     

       26
       30
        
           repo = "dask-image";

     
···

       28
       32
        
           hash = "sha256-kXCAqJ2Zgo/2Khvo2YcK+n4oGM219GyQ2Hsq9re1Lac=";

     

       29
       33
        
         };

     

       30
       34
        
       

     

       35
       35
       +
         postPatch = ''

     

       36
       36
       +
           substituteInPlace dask_image/ndinterp/__init__.py \

     

       37
       37
       +
             --replace-fail "out_bounds.ptp(axis=1)" "np.ptp(out_bounds, axis=1)"

     

       38
       38
       +
         '';

     

       39
       39
       +
       

     

       31
       40
        
         build-system = [

     

       32
       41
        
           setuptools

     

       33
       42
        
           setuptools-scm

     
···

       42
       51
        
         ];

     

       43
       52
        
       

     

       44
       53
        
         nativeCheckInputs = [

     

       54
       54
       +
           pyarrow

     

       45
       55
        
           pytestCheckHook

     

       46
       56
        
           scikit-image

     

       47
       57
        
         ];

     

       48
       58
        
       

     

       49
       59
        
         pythonImportsCheck = [ "dask_image" ];

     

       50
       60
        
       

     

       61
       61
       +
         disabledTests = [

     

       62
       62
       +
           # The following tests are from 'tests/test_dask_image/test_ndmeasure/test_find_objects.py' and

     

       63
       63
       +
           # fail because of errrors on numpy slices

     

       64
       64
       +
           # AttributeError: 'str' object has no attribute 'start'

     

       65
       65
       +
           "test_find_objects"

     

       66
       66
       +
           "test_3d_find_objects"

     

       67
       67
       +
           # AssertionError (comparing slices)

     

       68
       68
       +
           "test_find_objects_with_empty_chunks"

     

       69
       69
       +
         ];

     

       70
       70
       +
       

     

       51
       71
        
         meta = {

     

       52
       72
        
           description = "Distributed image processing";

     

       53
       73
        
           homepage = "https://github.com/dask/dask-image";

     

       74
       74
       +
           changelog = "https://github.com/dask/dask-image/releases/tag/v${version}";

     

       54
       75
        
           license = lib.licenses.bsdOriginal;

     

       55
       76
        
           maintainers = with lib.maintainers; [ GaetanLepage ];

     

       56
       77
        
         };

+9 -37

pkgs/development/python-modules/dask-ml/default.nix

···

       3
       3
        
         stdenv,

     

       4
       4
        
         buildPythonPackage,

     

       5
       5
        
         fetchFromGitHub,

     

       6
       6
       +
         fetchpatch,

     

       6
       7
        
       

     

       7
       8
        
         # build-system

     

       8
       9
        
         hatch-vcs,

     

       9
       10
        
         hatchling,

     

       10
       10
       -
         setuptools-scm,

     

       11
       11
        
       

     

       12
       12
        
         # dependencies

     

       13
       13
       -
         dask-expr,

     

       14
       13
        
         dask-glm,

     

       15
       14
        
         distributed,

     

       16
       15
        
         multipledispatch,

     
···

       29
       28
        
       

     

       30
       29
        
       buildPythonPackage rec {

     

       31
       30
        
         pname = "dask-ml";

     

       32
       32
       -
         version = "2024.4.4";

     

       31
       31
       +
         version = "2025.1.0";

     

       33
       32
        
         pyproject = true;

     

       34
       33
        
       

     

       35
       34
        
         src = fetchFromGitHub {

     

       36
       35
        
           owner = "dask";

     

       37
       36
        
           repo = "dask-ml";

     

       38
       37
        
           tag = "v${version}";

     

       39
       39
       -
           hash = "sha256-ZiBpCk3b4Tk0Hwb4uapJLEx+Nb/qHFROCnkBTNGDzoU=";

     

       38
       38
       +
           hash = "sha256-DHxx0LFuJmGWYuG/WGHj+a5XHAEekBmlHUUb90rl2IY=";

     

       40
       39
        
         };

     

       41
       40
        
       

     

       42
       41
        
         build-system = [

     

       43
       42
        
           hatch-vcs

     

       44
       43
        
           hatchling

     

       45
       45
       -
           setuptools-scm

     

       46
       44
        
         ];

     

       47
       45
        
       

     

       48
       46
        
         dependencies =

     

       49
       47
        
           [

     

       50
       50
       -
             dask-expr

     

       51
       48
        
             dask-glm

     

       52
       49
        
             distributed

     

       53
       50
        
             multipledispatch

     
···

       73
       70
        
           pytestCheckHook

     

       74
       71
        
         ];

     

       75
       72
        
       

     

       76
       76
       -
         disabledTestPaths =

     

       77
       77
       -
           [

     

       78
       78
       -
             # AttributeError: 'csr_matrix' object has no attribute 'A'

     

       79
       79
       -
             # Fixed in https://github.com/dask/dask-ml/pull/996

     

       80
       80
       -
             "tests/test_svd.py"

     

       81
       81
       -
       

     

       82
       82
       -
             # Tests fail with dask>=0.11.2

     

       83
       83
       -
             # RuntimeError: Not enough arguments provided

     

       84
       84
       -
             # Reported in https://github.com/dask/dask-ml/issues/1003

     

       85
       85
       -
             "tests/model_selection/test_incremental.py"

     

       86
       86
       -
           ]

     

       87
       87
       -
           ++ lib.optionals stdenv.isDarwin [

     

       88
       88
       -
             # RuntimeError: Not enough arguments provided: missing keys

     

       89
       89
       -
             "tests/model_selection/test_hyperband.py"

     

       90
       90
       -
             "tests/model_selection/test_incremental.py"

     

       91
       91
       -
             "tests/model_selection/test_incremental_warns.py"

     

       92
       92
       -
             "tests/model_selection/test_successive_halving.py"

     

       93
       93
       -
           ];

     

       73
       73
       +
         disabledTestPaths = [

     

       74
       74
       +
           # AttributeError: module 'numpy' has no attribute 'product'

     

       75
       75
       +
           "tests/test_svd.py"

     

       76
       76
       +
         ];

     

       94
       77
        
       

     

       95
       78
        
         disabledTests = [

     

       96
       96
       -
           # Flaky: `Arrays are not almost equal to 3 decimals` (although values do actually match)

     

       97
       97
       -
           "test_whitening"

     

       98
       98
       -
       

     

       99
       99
       -
           # Tests fail with dask>=0.11.2

     

       100
       100
       -
           # RuntimeError: Not enough arguments provided

     

       101
       101
       -
           # Reported in https://github.com/dask/dask-ml/issues/1003

     

       102
       102
       -
           "test_basic"

     

       103
       103
       -
           "test_hyperband_patience"

     

       104
       104
       -
           "test_same_random_state_same_params"

     

       105
       105
       -
           "test_search_patience_infeasible_tol"

     

       106
       106
       -
           "test_sha_max_iter_and_metadata"

     

       107
       107
       -
           "test_warns_decay_rate"

     

       108
       108
       -
           "test_warns_decay_rate_wanted"

     

       79
       79
       +
           # AssertionError: Regex pattern did not match.

     

       80
       80
       +
           "test_unknown_category_transform_array"

     

       109
       81
        
         ];

     

       110
       82
        
       

     

       111
       83
        
         __darwinAllowLocalNetworking = true;

+101 -144

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       3
        
         buildPythonPackage,

     

       5
       4
        
         fetchFromGitHub,

     

       6
       5
        
       

     
···

       27
       26
        
         jinja2,

     

       28
       27
        
       

     

       29
       28
        
         # tests

     

       30
       30
       -
         arrow-cpp,

     

       31
       31
       -
         dask-expr,

     

       32
       29
        
         hypothesis,

     

       33
       30
        
         pytest-asyncio,

     

       31
       31
       +
         pytest-cov-stub,

     

       32
       32
       +
         pytest-mock,

     

       34
       33
        
         pytest-rerunfailures,

     

       35
       34
        
         pytest-xdist,

     

       36
       35
        
         pytestCheckHook,

     

       36
       36
       +
         versionCheckHook,

     

       37
       37
        
       }:

     

       38
       38
        
       

     

       39
       39
       -
       let

     

       40
       40
       -
         self = buildPythonPackage rec {

     

       41
       41
       -
           pname = "dask";

     

       42
       42
       -
           version = "2024.12.1";

     

       43
       43
       -
           pyproject = true;

     

       39
       39
       +
       buildPythonPackage rec {

     

       40
       40
       +
         pname = "dask";

     

       41
       41
       +
         version = "2025.1.0";

     

       42
       42
       +
         pyproject = true;

     

       44
       43
        
       

     

       45
       45
       -
           src = fetchFromGitHub {

     

       46
       46
       -
             owner = "dask";

     

       47
       47
       -
             repo = "dask";

     

       48
       48
       -
             tag = version;

     

       49
       49
       -
             hash = "sha256-QqvdldAHW2UYt1NXfk3Aa+oe97e+OpRbF8d6eKV3OJ4=";

     

       50
       50
       -
           };

     

       44
       44
       +
         src = fetchFromGitHub {

     

       45
       45
       +
           owner = "dask";

     

       46
       46
       +
           repo = "dask";

     

       47
       47
       +
           tag = version;

     

       48
       48
       +
           hash = "sha256-KBqOyf471mNg3L9dYmR7IRSltEtC+VgC+6ptsoKgVmM=";

     

       49
       49
       +
         };

     

       51
       50
        
       

     

       52
       52
       -
           build-system = [ setuptools ];

     

       51
       51
       +
         postPatch = ''

     

       52
       52
       +
           # versioneer hack to set version of GitHub package

     

       53
       53
       +
           echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py

     

       53
       54
        
       

     

       54
       54
       -
           dependencies = [

     

       55
       55
       -
             click

     

       56
       56
       -
             cloudpickle

     

       57
       57
       -
             fsspec

     

       58
       58
       -
             packaging

     

       59
       59
       -
             partd

     

       60
       60
       -
             pyyaml

     

       61
       61
       -
             importlib-metadata

     

       62
       62
       -
             toolz

     

       63
       63
       -
           ];

     

       55
       55
       +
           substituteInPlace setup.py \

     

       56
       56
       +
             --replace-fail "import versioneer" "" \

     

       57
       57
       +
             --replace-fail "version=versioneer.get_version()," "version='${version}'," \

     

       58
       58
       +
             --replace-fail "cmdclass=versioneer.get_cmdclass()," ""

     

       59
       59
       +
       

     

       60
       60
       +
             substituteInPlace pyproject.toml \

     

       61
       61
       +
               --replace-fail ', "versioneer[toml]==0.29"' ""

     

       62
       62
       +
         '';

     

       63
       63
       +
       

     

       64
       64
       +
         build-system = [ setuptools ];

     

       64
       65
        
       

     

       65
       65
       -
           optional-dependencies = lib.fix (self: {

     

       66
       66
       -
             array = [ numpy ];

     

       67
       67
       -
             complete =

     

       68
       68
       -
               [

     

       69
       69
       -
                 pyarrow

     

       70
       70
       -
                 lz4

     

       71
       71
       -
               ]

     

       72
       72
       -
               ++ self.array

     

       73
       73
       -
               ++ self.dataframe

     

       74
       74
       -
               ++ self.distributed

     

       75
       75
       -
               ++ self.diagnostics;

     

       76
       76
       -
             dataframe = [

     

       77
       77
       -
               # dask-expr -> circular dependency with dask-expr

     

       78
       78
       -
               numpy

     

       79
       79
       -
               pandas

     

       80
       80
       -
             ];

     

       81
       81
       -
             distributed = [ distributed ];

     

       82
       82
       -
             diagnostics = [

     

       83
       83
       -
               bokeh

     

       84
       84
       -
               jinja2

     

       85
       85
       -
             ];

     

       86
       86
       -
           });

     

       66
       66
       +
         dependencies = [

     

       67
       67
       +
           click

     

       68
       68
       +
           cloudpickle

     

       69
       69
       +
           fsspec

     

       70
       70
       +
           packaging

     

       71
       71
       +
           partd

     

       72
       72
       +
           pyyaml

     

       73
       73
       +
           importlib-metadata

     

       74
       74
       +
           toolz

     

       75
       75
       +
         ];

     

       87
       76
        
       

     

       88
       88
       -
           nativeCheckInputs =

     

       77
       77
       +
         optional-dependencies = lib.fix (self: {

     

       78
       78
       +
           array = [ numpy ];

     

       79
       79
       +
           complete =

     

       89
       80
        
             [

     

       90
       90
       -
               dask-expr

     

       91
       91
       -
               pytestCheckHook

     

       92
       92
       -
               pytest-rerunfailures

     

       93
       93
       -
               pytest-xdist

     

       94
       94
       -
               # from panda[test]

     

       95
       95
       -
               hypothesis

     

       96
       96
       -
               pytest-asyncio

     

       81
       81
       +
               pyarrow

     

       82
       82
       +
               lz4

     

       97
       83
        
             ]

     

       98
       98
       -
             ++ self.optional-dependencies.array

     

       99
       99
       -
             ++ self.optional-dependencies.dataframe

     

       100
       100
       -
             ++ lib.optionals (!arrow-cpp.meta.broken) [

     

       101
       101
       -
               # support is sparse on aarch64

     

       102
       102
       -
               pyarrow

     

       103
       103
       -
             ];

     

       84
       84
       +
             ++ self.array

     

       85
       85
       +
             ++ self.dataframe

     

       86
       86
       +
             ++ self.distributed

     

       87
       87
       +
             ++ self.diagnostics;

     

       88
       88
       +
           dataframe = [

     

       89
       89
       +
             pandas

     

       90
       90
       +
             pyarrow

     

       91
       91
       +
           ] ++ self.array;

     

       92
       92
       +
           distributed = [ distributed ];

     

       93
       93
       +
           diagnostics = [

     

       94
       94
       +
             bokeh

     

       95
       95
       +
             jinja2

     

       96
       96
       +
           ];

     

       97
       97
       +
         });

     

       104
       98
        
       

     

       105
       105
       -
           dontUseSetuptoolsCheck = true;

     

       106
       106
       -
       

     

       107
       107
       -
           postPatch = ''

     

       108
       108
       -
             # versioneer hack to set version of GitHub package

     

       109
       109
       -
             echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py

     

       99
       99
       +
         nativeCheckInputs =

     

       100
       100
       +
           [

     

       101
       101
       +
             hypothesis

     

       102
       102
       +
             pyarrow

     

       103
       103
       +
             pytest-asyncio

     

       104
       104
       +
             pytest-cov-stub

     

       105
       105
       +
             pytest-mock

     

       106
       106
       +
             pytest-rerunfailures

     

       107
       107
       +
             pytest-xdist

     

       108
       108
       +
             pytestCheckHook

     

       109
       109
       +
             versionCheckHook

     

       110
       110
       +
           ]

     

       111
       111
       +
           ++ optional-dependencies.array

     

       112
       112
       +
           ++ optional-dependencies.dataframe;

     

       113
       113
       +
         versionCheckProgramArg = [ "--version" ];

     

       110
       114
        
       

     

       111
       111
       -
             substituteInPlace setup.py \

     

       112
       112
       -
               --replace-fail "import versioneer" "" \

     

       113
       113
       -
               --replace-fail "version=versioneer.get_version()," "version='${version}'," \

     

       114
       114
       -
               --replace-fail "cmdclass=versioneer.get_cmdclass()," ""

     

       115
       115
       -
       

     

       116
       116
       -
             substituteInPlace pyproject.toml \

     

       117
       117
       -
               --replace-fail ', "versioneer[toml]==0.29"' "" \

     

       118
       118
       -
               --replace-fail " --durations=10" "" \

     

       119
       119
       -
               --replace-fail " --cov-config=pyproject.toml" "" \

     

       120
       120
       -
               --replace-fail "\"-v" "\" "

     

       121
       121
       -
           '';

     

       122
       122
       -
       

     

       123
       123
       -
           pytestFlagsArray = [

     

       124
       124
       -
             # Rerun failed tests up to three times

     

       125
       125
       -
             "--reruns 3"

     

       126
       126
       -
             # Don't run tests that require network access

     

       127
       127
       -
             "-m 'not network'"

     

       128
       128
       -
           ];

     

       129
       129
       -
       

     

       130
       130
       -
           disabledTests =

     

       131
       131
       -
             lib.optionals stdenv.hostPlatform.isDarwin [

     

       132
       132
       -
               # Test requires features of python3Packages.psutil that are

     

       133
       133
       -
               # blocked in sandboxed-builds

     

       134
       134
       -
               "test_auto_blocksize_csv"

     

       135
       135
       -
               # AttributeError: 'str' object has no attribute 'decode'

     

       136
       136
       -
               "test_read_dir_nometa"

     

       137
       137
       -
             ]

     

       138
       138
       -
             ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [

     

       139
       139
       -
               # concurrent.futures.process.BrokenProcessPool: A process in the process pool terminated abpruptly...

     

       140
       140
       -
               "test_foldby_tree_reduction"

     

       141
       141
       -
               "test_to_bag"

     

       142
       142
       -
             ]

     

       143
       143
       -
             ++ [

     

       144
       144
       -
               # https://github.com/dask/dask/issues/10347#issuecomment-1589683941

     

       145
       145
       -
               "test_concat_categorical"

     

       146
       146
       -
               # AttributeError: 'ArrowStringArray' object has no attribute 'tobytes'. Did you mean: 'nbytes'?

     

       147
       147
       -
               "test_dot"

     

       148
       148
       -
               "test_dot_nan"

     

       149
       149
       -
               "test_merge_column_with_nulls"

     

       150
       150
       -
               # FileNotFoundError: [Errno 2] No such file or directory: '/build/tmp301jryv_/createme/0.part'

     

       151
       151
       -
               "test_to_csv_nodir"

     

       152
       152
       -
               "test_to_json_results"

     

       153
       153
       -
               # FutureWarning: Those tests should be working fine when pandas will have been upgraded to 2.1.1

     

       154
       154
       -
               "test_apply"

     

       155
       155
       -
               "test_apply_infer_columns"

     

       156
       156
       -
             ];

     

       115
       115
       +
         pytestFlagsArray = [

     

       116
       116
       +
           # Rerun failed tests up to three times

     

       117
       117
       +
           "--reruns 3"

     

       118
       118
       +
           # Don't run tests that require network access

     

       119
       119
       +
           "-m 'not network'"

     

       120
       120
       +
         ];

     

       157
       121
        
       

     

       158
       158
       -
           __darwinAllowLocalNetworking = true;

     

       122
       122
       +
         disabledTests = [

     

       123
       123
       +
           # UserWarning: Insufficient elements for `head`. 10 elements requested, only 5 elements available. Try passing larger `npartitions` to `head`.

     

       124
       124
       +
           "test_set_index_head_nlargest_string"

     

       125
       125
       +
         ];

     

       159
       126
        
       

     

       160
       160
       -
           pythonImportsCheck = [

     

       161
       161
       -
             "dask"

     

       162
       162
       -
             "dask.bag"

     

       163
       163
       -
             "dask.bytes"

     

       164
       164
       -
             "dask.diagnostics"

     

       165
       165
       -
           ];

     

       127
       127
       +
         __darwinAllowLocalNetworking = true;

     

       166
       128
        
       

     

       167
       167
       -
           doCheck = false;

     

       129
       129
       +
         pythonImportsCheck = [

     

       130
       130
       +
           "dask"

     

       131
       131
       +
           "dask.bag"

     

       132
       132
       +
           "dask.bytes"

     

       133
       133
       +
           "dask.diagnostics"

     

       168
       134
        
       

     

       169
       169
       -
           # Enable tests via passthru to avoid cyclic dependency with dask-expr.

     

       170
       170
       -
           passthru.tests = {

     

       171
       171
       -
             check = self.overridePythonAttrs (old: {

     

       172
       172
       -
               doCheck = true;

     

       173
       173
       -
               pythonImportsCheck = [

     

       174
       174
       -
                 # Requires the `dask.optional-dependencies.array` that are only in `nativeCheckInputs`

     

       175
       175
       -
                 "dask.array"

     

       176
       176
       -
                 # Requires the `dask.optional-dependencies.dataframe` that are only in `nativeCheckInputs`

     

       177
       177
       -
                 "dask.dataframe"

     

       178
       178
       -
                 "dask.dataframe.io"

     

       179
       179
       -
                 "dask.dataframe.tseries"

     

       180
       180
       -
               ] ++ old.pythonImportsCheck;

     

       181
       181
       -
             });

     

       182
       182
       -
           };

     

       135
       135
       +
           # Requires the `dask.optional-dependencies.array` that are only in `nativeCheckInputs`

     

       136
       136
       +
           "dask.array"

     

       137
       137
       +
           # Requires the `dask.optional-dependencies.dataframe` that are only in `nativeCheckInputs`

     

       138
       138
       +
           "dask.dataframe"

     

       139
       139
       +
           "dask.dataframe.io"

     

       140
       140
       +
           "dask.dataframe.tseries"

     

       141
       141
       +
         ];

     

       183
       142
        
       

     

       184
       184
       -
           meta = {

     

       185
       185
       -
             description = "Minimal task scheduling abstraction";

     

       186
       186
       -
             mainProgram = "dask";

     

       187
       187
       -
             homepage = "https://dask.org/";

     

       188
       188
       -
             changelog = "https://docs.dask.org/en/latest/changelog.html";

     

       189
       189
       -
             license = lib.licenses.bsd3;

     

       190
       190
       -
             maintainers = with lib.maintainers; [ GaetanLepage ];

     

       191
       191
       -
           };

     

       143
       143
       +
         meta = {

     

       144
       144
       +
           description = "Minimal task scheduling abstraction";

     

       145
       145
       +
           mainProgram = "dask";

     

       146
       146
       +
           homepage = "https://dask.org/";

     

       147
       147
       +
           changelog = "https://docs.dask.org/en/latest/changelog.html";

     

       148
       148
       +
           license = lib.licenses.bsd3;

     

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

     

       192
       150
        
         };

     

       193
       193
       -
       in

     

       194
       194
       -
       self

     

       151
       151
       +
       }

+19 -12

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

···

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       -
         setuptools,

     

       6
       6
       -
         setuptools-scm,

     

       5
       5
       +
       

     

       6
       6
       +
         # build-system

     

       7
       7
       +
         hatch-vcs,

     

       8
       8
       +
         hatchling,

     

       9
       9
       +
       

     

       10
       10
       +
         # dependencies

     

       7
       11
        
         matplotlib,

     

       8
       12
        
         mplhep-data,

     

       9
       13
        
         numpy,

     

       10
       14
        
         packaging,

     

       11
       15
        
         uhi,

     

       16
       16
       +
       

     

       17
       17
       +
         # tests

     

       18
       18
       +
         hist,

     

       19
       19
       +
         pytest-mock,

     

       20
       20
       +
         pytest-mpl,

     

       12
       21
        
         pytestCheckHook,

     

       13
       22
        
         scipy,

     

       14
       14
       -
         pytest-mpl,

     

       15
       15
       -
         pytest-mock,

     

       16
       23
        
         uproot,

     

       17
       17
       -
         hist,

     

       18
       24
        
       }:

     

       19
       25
        
       

     

       20
       26
        
       buildPythonPackage rec {

     

       21
       27
        
         pname = "mplhep";

     

       22
       22
       -
         version = "0.3.55";

     

       28
       28
       +
         version = "0.3.56";

     

       23
       29
        
         pyproject = true;

     

       24
       30
        
       

     

       25
       31
        
         src = fetchFromGitHub {

     

       26
       32
        
           owner = "scikit-hep";

     

       27
       33
        
           repo = "mplhep";

     

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

     

       29
       29
       -
           hash = "sha256-7YkrrH9Bfn3ctjv+H6TXEDE8yS/wnjO7umuHIXeYTDU=";

     

       35
       35
       +
           hash = "sha256-sMJpJUEtIqmu7kCgZp43t9XLy/6nkDgKcxC4nFb+1po=";

     

       30
       36
        
         };

     

       31
       37
        
       

     

       32
       38
        
         build-system = [

     

       33
       33
       -
           setuptools

     

       34
       34
       -
           setuptools-scm

     

       39
       39
       +
           hatch-vcs

     

       40
       40
       +
           hatchling

     

       35
       41
        
         ];

     

       36
       42
        
       

     

       37
       43
        
         dependencies = [

     
···

       43
       49
        
         ];

     

       44
       50
        
       

     

       45
       51
        
         nativeCheckInputs = [

     

       52
       52
       +
           hist

     

       53
       53
       +
           pytest-mock

     

       54
       54
       +
           pytest-mpl

     

       46
       55
        
           pytestCheckHook

     

       47
       56
        
           scipy

     

       48
       48
       -
           pytest-mpl

     

       49
       49
       -
           pytest-mock

     

       50
       57
        
           uproot

     

       51
       51
       -
           hist

     

       52
       58
        
         ];

     

       53
       59
        
       

     

       54
       60
        
         disabledTests = [

     
···

       62
       68
        
         meta = {

     

       63
       69
        
           description = "Extended histogram plots on top of matplotlib and HEP compatible styling similar to current collaboration requirements (ROOT)";

     

       64
       70
        
           homepage = "https://github.com/scikit-hep/mplhep";

     

       71
       71
       +
           changelog = "https://github.com/scikit-hep/mplhep/releases/tag/v${version}";

     

       65
       72
        
           license = with lib.licenses; [ mit ];

     

       66
       73
        
           maintainers = with lib.maintainers; [ veprbl ];

     

       67
       74
        
         };

+14 -13

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
       -
         # cudf,

     

       5
       5
       -
         dask,

     

       6
       6
       -
         dask-expr,

     

       7
       7
       -
         duckdb,

     

       8
       4
        
         fetchFromGitHub,

     

       5
       5
       +
       

     

       6
       6
       +
         # build-system

     

       9
       7
        
         hatchling,

     

       10
       10
       -
         hypothesis,

     

       8
       8
       +
       

     

       9
       9
       +
         # optional-dependencies

     

       10
       10
       +
         # cudf,

     

       11
       11
       +
         dask,

     

       11
       12
        
         # modin,

     

       12
       13
        
         pandas,

     

       13
       14
        
         polars,

     

       14
       15
        
         pyarrow,

     

       16
       16
       +
       

     

       17
       17
       +
         # tests

     

       18
       18
       +
         duckdb,

     

       19
       19
       +
         hypothesis,

     

       15
       20
        
         pytest-env,

     

       16
       21
        
         pytestCheckHook,

     

       17
       17
       -
         pythonOlder,

     

       18
       22
        
       }:

     

       19
       23
        
       

     

       20
       24
        
       buildPythonPackage rec {

     

       21
       25
        
         pname = "narwhals";

     

       22
       22
       -
         version = "1.22.0";

     

       26
       26
       +
         version = "1.26.0";

     

       23
       27
        
         pyproject = true;

     

       24
       28
        
       

     

       25
       25
       -
         disabled = pythonOlder "3.8";

     

       26
       26
       -
       

     

       27
       29
        
         src = fetchFromGitHub {

     

       28
       30
        
           owner = "narwhals-dev";

     

       29
       31
        
           repo = "narwhals";

     

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

     

       31
       31
       -
           hash = "sha256-I6nJJiiW1v04YH70OPxXKeO80N52nnCPKRzJLILEWmw=";

     

       33
       33
       +
           hash = "sha256-tGxRJauYD0mCA66Rd2i8jJsuDLVgyk35F7HRMR1ZkQs=";

     

       32
       34
        
         };

     

       33
       35
        
       

     

       34
       36
        
         build-system = [

     
···

       39
       41
        
           # cudf = [ cudf ];

     

       40
       42
        
           dask = [

     

       41
       43
        
             dask

     

       42
       42
       -
             dask-expr

     

       43
       43
       -
           ];

     

       44
       44
       +
           ] ++ dask.optional-dependencies.dataframe;

     

       44
       45
        
           # modin = [ modin ];

     

       45
       46
        
           pandas = [ pandas ];

     

       46
       47
        
           polars = [ polars ];

     
···

       64
       65
        
         meta = {

     

       65
       66
        
           description = "Lightweight and extensible compatibility layer between dataframe libraries";

     

       66
       67
        
           homepage = "https://github.com/narwhals-dev/narwhals";

     

       67
       67
       -
           changelog = "https://github.com/narwhals-dev/narwhals/releases/tag/${src.tag}";

     

       68
       68
       +
           changelog = "https://github.com/narwhals-dev/narwhals/releases/tag/v${version}";

     

       68
       69
        
           license = lib.licenses.mit;

     

       69
       70
        
           maintainers = with lib.maintainers; [ fab ];

     

       70
       71
        
         };

+54

pkgs/development/python-modules/open-hypergraphs/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildPythonPackage,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         hatchling,

     

       6
       6
       +
         numpy,

     

       7
       7
       +
         scipy,

     

       8
       8
       +
         hypothesis,

     

       9
       9
       +
         pytestCheckHook,

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       buildPythonPackage rec {

     

       13
       13
       +
         pname = "open-hypergraphs";

     

       14
       14
       +
         version = "0.1.2";

     

       15
       15
       +
         pyproject = true;

     

       16
       16
       +
       

     

       17
       17
       +
         src = fetchFromGitHub {

     

       18
       18
       +
           owner = "statusfailed";

     

       19
       19
       +
           repo = "open-hypergraphs";

     

       20
       20
       +
           tag = "pypi-${version}";

     

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

     

       22
       22
       +
         };

     

       23
       23
       +
       

     

       24
       24
       +
         build-system = [

     

       25
       25
       +
           hatchling

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         dependencies = [

     

       29
       29
       +
           numpy

     

       30
       30
       +
           scipy

     

       31
       31
       +
         ];

     

       32
       32
       +
       

     

       33
       33
       +
         pythonRelaxDeps = [

     

       34
       34
       +
           "numpy"

     

       35
       35
       +
           "scipy"

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         nativeCheckInputs = [

     

       39
       39
       +
           pytestCheckHook

     

       40
       40
       +
           hypothesis

     

       41
       41
       +
         ];

     

       42
       42
       +
       

     

       43
       43
       +
         pythonImportsCheck = [

     

       44
       44
       +
           "open_hypergraphs"

     

       45
       45
       +
         ];

     

       46
       46
       +
       

     

       47
       47
       +
         meta = {

     

       48
       48
       +
           description = "Implementation of open hypergraphs for string diagrams";

     

       49
       49
       +
           homepage = "https://github.com/statusfailed/open-hypergraphs";

     

       50
       50
       +
           changelog = "https://github.com/statusfailed/open-hypergraphs/blob/${src.rev}/CHANGELOG.md";

     

       51
       51
       +
           license = lib.licenses.mit;

     

       52
       52
       +
           maintainers = with lib.maintainers; [ bcdarwin ];

     

       53
       53
       +
         };

     

       54
       54
       +
       }

+17 -17

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

···

       66
       66
        
       

     

       67
       67
        
       let

     

       68
       68
        
         pname = "ray";

     

       69
       69
       -
         version = "2.42.0";

     

       69
       69
       +
         version = "2.42.1";

     

       70
       70
        
       in

     

       71
       71
        
       buildPythonPackage rec {

     

       72
       72
        
         inherit pname version;

     
···

       87
       87
        
             # curl https://pypi.org/pypi/ray/${version}/json | jq -r '.urls[] | "\(.digests.sha256)  \(.filename)"'

     

       88
       88
        
             hashes = {

     

       89
       89
        
               aarch64-darwin = {

     

       90
       90
       -
                 cp39 = "4835c58b2e14f70badc059e9a6310cbfb51dec7a5b20fe712a4d193c85c9b2c5";

     

       91
       91
       -
                 cp310 = "4bb3d88c478dd2cc3a17a66f0c47a73978608ce5579f92f77a468720763c2331";

     

       92
       92
       -
                 cp311 = "7de151d403f351bb0fe3ed6f3f0e0258ce989871c60e4ccca2ab5bab7e9fc820";

     

       93
       93
       -
                 cp312 = "4a3ab3d73541c4e1b8c0dca31d4006ba18b20ccf7eb7a7428f5dbf96e9736a83";

     

       90
       90
       +
                 cp39 = "sha256-MijkhGUC4MW+rmm2mfyQcaBtPPv8DKXyvScHkkpS40s=";

     

       91
       91
       +
                 cp310 = "sha256-YHJ/nHKo9xvE4U1H3E3ElNxZo8Sw0QiuBPpuWo5FIo8=";

     

       92
       92
       +
                 cp311 = "sha256-8BlRTFIgqCL7wMOO0fdQXOx1uWGnYEq2d/1kd+M6Ki4";

     

       93
       93
       +
                 cp312 = "sha256-orb2JZC7YF1m043rSV84MqbQMB2z9JatxU0SoURUHjc=";

     

       94
       94
        
               };

     

       95
       95
        
               aarch64-linux = {

     

       96
       96
       -
                 cp39 = "sha256-NlE3pzeWzz6DlS2Y6Gv8W+1DRMjK1a9T2R9lvq5nL7g=";

     

       97
       97
       -
                 cp310 = "sha256-MxCDruyfxiqy/Fkn0YM1idpZNUvChx8Xt6EBie7Q2uY=";

     

       98
       98
       -
                 cp311 = "sha256-eb9KDQIX6i2O/UfeZ9nCKTBAGc6ZZ427FI9WXZakRuI=";

     

       99
       99
       -
                 cp312 = "sha256-PnKHZmINbjEYajepBsB7gH2i86rPSxZ/bos3xy7U3mM=";

     

       96
       96
       +
                 cp39 = "sha256-V/epiChYGASp537Jnz/d1UIl2r2pwNmmdx630i5pMHI=";

     

       97
       97
       +
                 cp310 = "sha256-kNi/DBr+I2SjP1NWNnYaV0440oOwQGE7joY5vhQdBKA=";

     

       98
       98
       +
                 cp311 = "sha256-xdeeSYrOtapbPlMH7HSV9YSGtCZrOP7qOXm5iB6VDE8=";

     

       99
       99
       +
                 cp312 = "sha256-nKXH/V9nboMXgS53AY9i+HxbOa4Op/n4DW6YzSL99Vo=";

     

       100
       100
        
               };

     

       101
       101
        
               x86_64-darwin = {

     

       102
       102
       -
                 cp39 = "aa5692cc8f584c5f531074fd7283004acfbc538b36101f6c403d4ff1837aca52";

     

       103
       103
       -
                 cp310 = "515bc5d9811cc4bb982daf6c7b2c82453cccc886e41514e03bc3342293acb109";

     

       104
       104
       -
                 cp311 = "6e2b8ad794729f068742ffc2547fd322fa6ef31e46e886ac6e53690b86415cf0";

     

       105
       105
       -
                 cp312 = "6b117e01d0304305e459cccc78e1b46dc1ee60227a2afd8569d97b7a2bc516ed";

     

       102
       102
       +
                 cp39 = "sha256-EgWa4hgQ0K6LCcx8N51SzRCIgbi56cYo0ywEWXD8KsQ=";

     

       103
       103
       +
                 cp310 = "sha256-ufLyDLLd31LsB+JU84upFGe4bfETMImdauI2GD45UnU=";

     

       104
       104
       +
                 cp311 = "sha256-ToHIlnedis5mr8KsdQUIBtsQLZUBou1uovOAEJYsyn8=";

     

       105
       105
       +
                 cp312 = "sha256-t+9IkWQyoNXMyr78jL2L8MDSrQuIQczjzr0bEzmWyjY=";

     

       106
       106
        
               };

     

       107
       107
        
               x86_64-linux = {

     

       108
       108
       -
                 cp39 = "sha256-rGz4bKRemxRdHCLPpHBpzdyq3ms/3Bsd5adhEJfZbX4=";

     

       109
       109
       -
                 cp310 = "sha256-i+C9U2ErZEbDm09OnLS9NUhknVISR3NJzPvcklCHgik=";

     

       110
       110
       -
                 cp311 = "sha256-6JJLbtCGZVsr+LP/KaxFPR6Kp6TW0s6WW7ql+xfRNk8=";

     

       111
       111
       -
                 cp312 = "sha256-4+3gNnqyj72GiiL05M2sRFQ8ZU4svFo7SCF45/cl6iw=";

     

       108
       108
       +
                 cp39 = "sha256-LUATaRjN1/YHEKpGRS7vqcDkYOLE51svxXI8c9521wE=";

     

       109
       109
       +
                 cp310 = "sha256-AYAiSeuc02Mm5v4LqoiRb6YGJzHaElBryT5zbxcRHdQ=";

     

       110
       110
       +
                 cp311 = "sha256-z1vEMnUuKbyADjAAO9ZJM9eFND9ZqajDGoOc2YH8UIQ=";

     

       111
       111
       +
                 cp312 = "sha256-4Np/+6ctOsJ1B4FvAPKtM0+BWDX0e4sEghzFdQ7Flkc=";

     

       112
       112
        
               };

     

       113
       113
        
             };

     

       114
       114
        
           in

+25 -35

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
       -
         pythonOlder,

     

       5
       5
       -
         fetchPypi,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
       

     

       6
       6
       +
         # build-system

     

       6
       7
        
         setuptools,

     

       7
       7
       -
         confluent-kafka,

     

       8
       8
       -
         dask,

     

       9
       9
       -
         dask-expr,

     

       10
       10
       -
         distributed,

     

       11
       11
       -
         flaky,

     

       12
       12
       -
         graphviz,

     

       13
       13
       -
         networkx,

     

       14
       14
       -
         pytest-asyncio,

     

       15
       15
       -
         pytestCheckHook,

     

       16
       16
       -
         requests,

     

       8
       8
       +
       

     

       9
       9
       +
         # dependencies

     

       17
       10
        
         six,

     

       18
       11
        
         toolz,

     

       19
       12
        
         tornado,

     

       20
       13
        
         zict,

     

       14
       14
       +
       

     

       15
       15
       +
         # tests

     

       16
       16
       +
         dask,

     

       17
       17
       +
         distributed,

     

       18
       18
       +
         flaky,

     

       19
       19
       +
         pandas,

     

       20
       20
       +
         pyarrow,

     

       21
       21
       +
         pytestCheckHook,

     

       21
       22
        
       }:

     

       22
       23
        
       

     

       23
       24
        
       buildPythonPackage rec {

     
···

       25
       26
        
         version = "0.6.4";

     

       26
       27
        
         pyproject = true;

     

       27
       28
        
       

     

       28
       28
       -
         disabled = pythonOlder "3.6";

     

       29
       29
       -
       

     

       30
       30
       -
         src = fetchPypi {

     

       31
       31
       -
           inherit pname version;

     

       32
       32
       -
           hash = "sha256-VXfWkEwuxInBQVQJV3IQXgGVRkiBmYfUZCBMbjyWNPM=";

     

       29
       29
       +
         src = fetchFromGitHub {

     

       30
       30
       +
           owner = "python-streamz";

     

       31
       31
       +
           repo = "streamz";

     

       32
       32
       +
           tag = version;

     

       33
       33
       +
           hash = "sha256-lSb3gl+TSIzz4BZzxH8zXu74HvzSntOAoVQUUJKIEvA=";

     

       33
       34
        
         };

     

       34
       35
        
       

     

       35
       36
        
         build-system = [ setuptools ];

     

       36
       37
        
       

     

       37
       38
        
         dependencies = [

     

       38
       38
       -
           networkx

     

       39
       39
        
           six

     

       40
       40
        
           toolz

     

       41
       41
        
           tornado

     
···

       43
       43
        
         ];

     

       44
       44
        
       

     

       45
       45
        
         nativeCheckInputs = [

     

       46
       46
       -
           confluent-kafka

     

       47
       46
        
           dask

     

       48
       48
       -
           dask-expr

     

       49
       47
        
           distributed

     

       50
       48
        
           flaky

     

       51
       51
       -
           graphviz

     

       52
       52
       -
           pytest-asyncio

     

       49
       49
       +
           pandas

     

       50
       50
       +
           pyarrow

     

       53
       51
        
           pytestCheckHook

     

       54
       54
       -
           requests

     

       55
       52
        
         ];

     

       56
       53
        
       

     

       57
       54
        
         pythonImportsCheck = [ "streamz" ];

     
···

       63
       60
        
           "test_partition_then_scatter_sync"

     

       64
       61
        
           "test_sync"

     

       65
       62
        
           "test_sync_2"

     

       66
       66
       -
           # Test fail in the sandbox

     

       67
       67
       -
           "test_tcp_async"

     

       68
       68
       -
           "test_tcp"

     

       69
       69
       -
           "test_partition_timeout"

     

       63
       63
       +
       

     

       70
       64
        
           # Tests are flaky

     

       71
       71
       -
           "test_from_iterable"

     

       72
       65
        
           "test_buffer"

     

       73
       66
        
         ];

     

       74
       67
        
       

     

       75
       75
       -
         disabledTestPaths = [

     

       76
       76
       -
           # Disable kafka tests

     

       77
       77
       -
           "streamz/tests/test_kafka.py"

     

       78
       78
       -
         ];

     

       68
       68
       +
         __darwinAllowLocalNetworking = true;

     

       79
       69
        
       

     

       80
       80
       -
         meta = with lib; {

     

       70
       70
       +
         meta = {

     

       81
       71
        
           description = "Pipelines to manage continuous streams of data";

     

       82
       72
        
           homepage = "https://github.com/python-streamz/streamz";

     

       83
       83
       -
           license = licenses.bsd3;

     

       84
       84
       -
           maintainers = [ ];

     

       73
       73
       +
           license = lib.licenses.bsd3;

     

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

     

       85
       75
        
         };

     

       86
       76
        
       }

+1 -1

pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix

···

       175
       175
        
         # Compat is for making other platforms look like FreeBSD (e.g. to

     

       176
       176
        
         # build build-time dependencies for building FreeBSD packages). It is

     

       177
       177
        
         # not needed when building for FreeBSD.

     

       178
       178
       -
         meta.broken = stdenv.hostPlatform.isFreeBSD;

     

       178
       178
       +
         meta.platforms = lib.platforms.linux;

     

       179
       179
        
       

     

       180
       180
        
         alwaysKeepStatic = true;

     

       181
       181
        
       }

+16

pkgs/os-specific/bsd/freebsd/pkgs/fstat.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         mkDerivation,

     

       4
       4
       +
       }:

     

       5
       5
       +
       mkDerivation {

     

       6
       6
       +
         path = "usr.bin/fstat";

     

       7
       7
       +
       

     

       8
       8
       +
         outputs = [

     

       9
       9
       +
           "out"

     

       10
       10
       +
           "man"

     

       11
       11
       +
           "debug"

     

       12
       12
       +
         ];

     

       13
       13
       +
       

     

       14
       14
       +
         meta.mainProgram = "fstat";

     

       15
       15
       +
         meta.platforms = lib.platforms.freebsd;

     

       16
       16
       +
       }

+10

pkgs/os-specific/bsd/freebsd/pkgs/mount_nullfs.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         mkDerivation,

     

       4
       4
       +
       }:

     

       5
       5
       +
       mkDerivation {

     

       6
       6
       +
         path = "sbin/mount_nullfs";

     

       7
       7
       +
         extraPaths = [ "sbin/mount" ];

     

       8
       8
       +
       

     

       9
       9
       +
         meta.platforms = lib.platforms.freebsd;

     

       10
       10
       +
       }

+24

pkgs/os-specific/bsd/freebsd/pkgs/procstat.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         mkDerivation,

     

       4
       4
       +
         libxo,

     

       5
       5
       +
         libsbuf,

     

       6
       6
       +
       }:

     

       7
       7
       +
       mkDerivation {

     

       8
       8
       +
         path = "usr.bin/procstat";

     

       9
       9
       +
         buildInputs = [

     

       10
       10
       +
           libxo

     

       11
       11
       +
           libsbuf

     

       12
       12
       +
         ];

     

       13
       13
       +
       

     

       14
       14
       +
         outputs = [

     

       15
       15
       +
           "out"

     

       16
       16
       +
           "man"

     

       17
       17
       +
           "debug"

     

       18
       18
       +
         ];

     

       19
       19
       +
       

     

       20
       20
       +
         MK_TESTS = "no";

     

       21
       21
       +
       

     

       22
       22
       +
         meta.platforms = lib.platforms.freebsd;

     

       23
       23
       +
         meta.mainProgram = "procstat";

     

       24
       24
       +
       }

+19

pkgs/os-specific/bsd/freebsd/pkgs/umount.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         mkDerivation,

     

       4
       4
       +
       }:

     

       5
       5
       +
       mkDerivation {

     

       6
       6
       +
         path = "sbin/umount";

     

       7
       7
       +
         extraPaths = [

     

       8
       8
       +
           "sbin/mount"

     

       9
       9
       +
           "usr.sbin/rpc.umntall"

     

       10
       10
       +
         ];

     

       11
       11
       +
       

     

       12
       12
       +
         outputs = [

     

       13
       13
       +
           "out"

     

       14
       14
       +
           "man"

     

       15
       15
       +
           "debug"

     

       16
       16
       +
         ];

     

       17
       17
       +
       

     

       18
       18
       +
         meta.platforms = lib.platforms.freebsd;

     

       19
       19
       +
       }

+1 -3

pkgs/os-specific/bsd/openbsd/pkgs/dmesg.nix

···

       1
       1
       -
       { mkDerivation, libkvm }:

     

       1
       1
       +
       { mkDerivation }:

     

       2
       2
        
       mkDerivation {

     

       3
       3
        
         path = "sbin/dmesg";

     

       4
       4
       -
       

     

       5
       5
       -
         buildInputs = [ libkvm ];

     

       6
       4
        
       

     

       7
       5
        
         postPatch = ''

     

       8
       6
        
           sed -i /DPADD/d $BSDSRCDIR/sbin/dmesg/Makefile

+34

pkgs/os-specific/bsd/openbsd/pkgs/fsck/fsck-path.patch

···

       1
       1
       +
       diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c

     

       2
       2
       +
       index 19e730a484f..cb548971abd 100644

     

       3
       3
       +
       --- a/sbin/fsck/fsck.c

     

       4
       4
       +
       +++ b/sbin/fsck/fsck.c

     

       5
       5
       +
       @@ -115,6 +115,8 @@ main(int argc, char *argv[])

     

       6
       6
       +
        		err(1, "unveil %s", _PATH_FSTAB);

     

       7
       7
       +
        	if (unveil("/sbin", "x") == -1)

     

       8
       8
       +
        		err(1, "unveil /sbin");

     

       9
       9
       +
       +	if (unveil("/nix/store", "rx") == -1)

     

       10
       10
       +
       +		err(1, "unveil /nix/store");

     

       11
       11
       +
        	if (pledge("stdio rpath wpath disklabel proc exec", NULL) == -1)

     

       12
       12
       +
        		err(1, "pledge");

     

       13
       13
       +
        

     

       14
       14
       +
       @@ -308,18 +310,8 @@ checkfs(const char *vfstype, const char *spec, const char *mntpt, void *auxarg,

     

       15
       15
       +
        			_exit(0);

     

       16
       16
       +
        

     

       17
       17
       +
        		/* Go find an executable. */

     

       18
       18
       +
       -		edir = edirs;

     

       19
       19
       +
       -		do {

     

       20
       20
       +
       -			(void)snprintf(execname,

     

       21
       21
       +
       -			    sizeof(execname), "%s/fsck_%s", *edir, vfstype);

     

       22
       22
       +
       -			execv(execname, (char * const *)argv);

     

       23
       23
       +
       -			if (errno != ENOENT) {

     

       24
       24
       +
       -				if (spec)

     

       25
       25
       +
       -					warn("exec %s for %s", execname, spec);

     

       26
       26
       +
       -				else

     

       27
       27
       +
       -					warn("exec %s", execname);

     

       28
       28
       +
       -			}

     

       29
       29
       +
       -		} while (*++edir != NULL);

     

       30
       30
       +
       +		(void)snprintf(execname, sizeof(execname), "fsck_%s", vfstype);

     

       31
       31
       +
       +		execvp(execname, (char * const *)argv);

     

       32
       32
       +
        

     

       33
       33
       +
        		if (errno == ENOENT) {

     

       34
       34
       +
        			if (spec)

pkgs/os-specific/bsd/openbsd/pkgs/fsck/package.nix

···

       1
       1
       +
       { mkDerivation }:

     

       2
       2
       +
       mkDerivation {

     

       3
       3
       +
         path = "sbin/fsck";

     

       4
       4
       +
       

     

       5
       5
       +
         patches = [ ./fsck-path.patch ];

     

       6
       6
       +
       }

pkgs/os-specific/bsd/openbsd/pkgs/fsck_ffs.nix

···

       1
       1
       +
       { mkDerivation }:

     

       2
       2
       +
       mkDerivation {

     

       3
       3
       +
         path = "sbin/fsck_ffs";

     

       4
       4
       +
         extraPaths = [

     

       5
       5
       +
           "sbin/fsck"

     

       6
       6
       +
           "sys/ufs/ffs"

     

       7
       7
       +
         ];

     

       8
       8
       +
       }

pkgs/os-specific/bsd/openbsd/pkgs/fsck_msdos.nix

···

       1
       1
       +
       { mkDerivation }:

     

       2
       2
       +
       mkDerivation {

     

       3
       3
       +
         path = "sbin/fsck_msdos";

     

       4
       4
       +
         extraPaths = [ "sbin/fsck" ];

     

       5
       5
       +
       }

pkgs/os-specific/bsd/openbsd/pkgs/libc.nix

···

       8
       8
        
         librpcsvc,

     

       9
       9
        
         libutil,

     

       10
       10
        
         libexecinfo,

     

       11
       11
       +
         libkvm,

     

       11
       12
        
         rtld,

     

       12
       13
        
         version,

     

       13
       14
        
       }:

     
···

       38
       39
        
                 librpcsvc

     

       39
       40
        
                 libutil

     

       40
       41
        
                 libexecinfo

     

       42
       42
       +
                 libkvm

     

       41
       43
        
               ]

     

       42
       44
        
               ++ (lib.optional (!stdenvNoLibc.hostPlatform.isStatic) rtld)

     

       43
       45
        
             );

pkgs/os-specific/bsd/openbsd/pkgs/libkvm.nix

···

       3
       3
        
       }:

     

       4
       4
        
       mkDerivation {

     

       5
       5
        
         path = "lib/libkvm";

     

       6
       6
       +
       

     

       7
       7
       +
         libcMinimal = true;

     

       6
       8
        
       }

+18

pkgs/os-specific/bsd/openbsd/pkgs/makedev/bash.patch

···

       1
       1
       +
       diff --git a/etc/MAKEDEV.common b/etc/MAKEDEV.common

     

       2
       2
       +
       index 1e7bb3d235a..1cc64a38985 100644

     

       3
       3
       +
       --- a/etc/MAKEDEV.common

     

       4
       4
       +
       +++ b/etc/MAKEDEV.common

     

       5
       5
       +
       @@ -315,10 +315,10 @@ _mkdev(pty, pty*, {-if [ $U -gt 15 ]; then

     

       6
       6
       +
        		echo bad unit for pty in: $i

     

       7
       7
       +
        		continue

     

       8
       8
       +
        	fi

     

       9
       9
       +
       -	set -A letters p q r s t u v w x y z P Q R S T

     

       10
       10
       +
       -	set -A suffixes 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q \

     

       11
       11
       +
       +	letters=(p q r s t u v w x y z P Q R S T)

     

       12
       12
       +
       +	suffixes=(0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q \

     

       13
       13
       +
        	    r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X \

     

       14
       14
       +
       -	    Y Z

     

       15
       15
       +
       +	    Y Z)

     

       16
       16
       +
        

     

       17
       17
       +
        	name=${letters[$U]}

     

       18
       18
       +
        	n=0

+37

pkgs/os-specific/bsd/openbsd/pkgs/makedev/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation,

     

       3
       3
       +
         runtimeShell,

     

       4
       4
       +
         m4,

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       mkDerivation {

     

       8
       8
       +
         pname = "MAKEDEV";

     

       9
       9
       +
         path = "etc";

     

       10
       10
       +
       

     

       11
       11
       +
         patches = [ ./bash.patch ];

     

       12
       12
       +
       

     

       13
       13
       +
         extraNativeBuildInputs = [

     

       14
       14
       +
           m4

     

       15
       15
       +
         ];

     

       16
       16
       +
       

     

       17
       17
       +
         preBuild = ''

     

       18
       18
       +
           mkdir -p $out/share/doc

     

       19
       19
       +
         '';

     

       20
       20
       +
         buildTargets = [ "MAKEDEV" ];

     

       21
       21
       +
       

     

       22
       22
       +
         # patch some build artifacts

     

       23
       23
       +
         # gnu m4 doesn't seem to recognize the expr() macro but it's only used for simple arithmetic so we convert it to bash

     

       24
       24
       +
         postBuild = ''

     

       25
       25
       +
           substituteInPlace etc.$TARGET_MACHINE_ARCH/MAKEDEV --replace-fail "/bin/sh -" "${runtimeShell}"

     

       26
       26
       +
           sed -E -i -e '/^PATH=.*/d' -e 's/expr\((.*)\)/$((\1))/g' etc.$TARGET_MACHINE_ARCH/MAKEDEV

     

       27
       27
       +
         '';

     

       28
       28
       +
       

     

       29
       29
       +
         # The install procedure is also weird since this is supposed to live in /dev

     

       30
       30
       +
         postInstall = ''

     

       31
       31
       +
           mkdir -p $out/bin

     

       32
       32
       +
           cp etc.$TARGET_MACHINE_ARCH/MAKEDEV $out/bin

     

       33
       33
       +
           chmod +x $out/bin/MAKEDEV

     

       34
       34
       +
         '';

     

       35
       35
       +
       

     

       36
       36
       +
         meta.mainProgram = "MAKEDEV";

     

       37
       37
       +
       }

-5

pkgs/os-specific/bsd/openbsd/pkgs/pkill.nix

···

       1
       1
        
       {

     

       2
       2
        
         mkDerivation,

     

       3
       3
       -
         libkvm,

     

       4
       3
        
       }:

     

       5
       4
        
       mkDerivation {

     

       6
       5
        
         path = "usr.bin/pkill";

     

       7
       7
       -
       

     

       8
       8
       -
         buildInputs = [

     

       9
       9
       -
           libkvm

     

       10
       10
       -
         ];

     

       11
       6
        
       

     

       12
       7
        
         postPatch = ''

     

       13
       8
        
           sed -i /DPADD/d $BSDSRCDIR/usr.bin/pkill/Makefile

+1 -2

pkgs/os-specific/bsd/openbsd/pkgs/ps.nix

···

       1
       1
       -
       { mkDerivation, libkvm }:

     

       1
       1
       +
       { mkDerivation }:

     

       2
       2
        
       mkDerivation {

     

       3
       3
        
         path = "bin/ps";

     

       4
       4
        
       

     

       5
       5
       -
         buildInputs = [ libkvm ];

     

       6
       5
        
         postPatch = ''

     

       7
       6
        
           sed -i /DPADD/d $BSDSRCDIR/bin/ps/Makefile

     

       8
       7
        
         '';

+146

pkgs/os-specific/bsd/openbsd/pkgs/rc/boot-phases.patch

···

       1
       1
       +
       OpenBSD's rc is supremely, supremely uncooperative when it comes to

     

       2
       2
       +
       customization and configuration, providing exactly two places to inject

     

       3
       3
       +
       services (pkg_scripts from rc.conf and /etc/rc.local), which are very much not

     

       4
       4
       +
       useful for configuring more intimate parts of the boot process. This patch

     

       5
       5
       +
       pulls the scripts to start at various injection points from /etc/rc.order. It

     

       6
       6
       +
       also removes some of the parts of the boot script which are inappropriate for a

     

       7
       7
       +
       nix-based system, for example, re-linking code objects and setting PATH.

     

       8
       8
       +
       

     

       9
       9
       +
       diff --git a/etc/rc b/etc/rc

     

       10
       10
       +
       index 9d87fac8caf..581c1e3f4ab 100644

     

       11
       11
       +
       --- a/etc/rc

     

       12
       12
       +
       +++ b/etc/rc

     

       13
       13
       +
       @@ -9,6 +9,10 @@ set +o sh

     

       14
       14
       +
        

     

       15
       15
       +
        # Subroutines (have to come first).

     

       16
       16
       +
        

     

       17
       17
       +
       +daemon_phase() {

     

       18
       18
       +
       +	. /etc/rc.order/$1

     

       19
       19
       +
       +}

     

       20
       20
       +
       +

     

       21
       21
       +
        # Strip in- and whole-line comments from a file.

     

       22
       22
       +
        # Strip leading and trailing whitespace if IFS is set.

     

       23
       23
       +
        # Usage: stripcom /path/to/file

     

       24
       24
       +
       @@ -337,7 +341,6 @@ trap : 3	# Shouldn't be needed.

     

       25
       25
       +
        

     

       26
       26
       +
        export HOME=/

     

       27
       27
       +
        export INRC=1

     

       28
       28
       +
       -export PATH=/sbin:/bin:/usr/sbin:/usr/bin

     

       29
       29
       +
        

     

       30
       30
       +
        # /etc/myname contains my symbolic name.

     

       31
       31
       +
        if [[ -f /etc/myname ]]; then

     

       32
       32
       +
       @@ -413,17 +416,12 @@ fi

     

       33
       33
       +
        # From now on, allow user to interrupt (^C) the boot process.

     

       34
       34
       +
        trap "echo 'Boot interrupted.'; exit 1" 3

     

       35
       35
       +
        

     

       36
       36
       +
       -# Unmount all filesystems except root.

     

       37
       37
       +
       -umount -a >/dev/null 2>&1

     

       38
       38
       +
       -

     

       39
       39
       +
        # Mount all filesystems except those of type NFS and VND.

     

       40
       40
       +
        mount -a -t nonfs,vnd

     

       41
       41
       +
        

     

       42
       42
       +
        # Re-mount the root filesystem read/writeable. (root on nfs requires this,

     

       43
       43
       +
        # others aren't hurt.)

     

       44
       44
       +
        mount -uw /

     

       45
       45
       +
       -chmod og-rwx /bsd

     

       46
       46
       +
       -ln -fh /bsd /bsd.booted

     

       47
       47
       +
        

     

       48
       48
       +
        rm -f /fastboot

     

       49
       49
       +
        

     

       50
       50
       +
       @@ -483,9 +481,9 @@ mount -s /var >/dev/null 2>&1		# cannot be on NFS

     

       51
       51
       +
        mount -s /var/log >/dev/null 2>&1	# cannot be on NFS

     

       52
       52
       +
        mount -s /usr >/dev/null 2>&1		# if NFS, fstab must use IP address

     

       53
       53
       +
        

     

       54
       54
       +
       -reorder_libs 2>&1 |&

     

       55
       55
       +
       +daemon_phase 10

     

       56
       56
       +
        

     

       57
       57
       +
       -start_daemon slaacd dhcpleased resolvd >/dev/null 2>&1

     

       58
       58
       +
       +daemon_phase 20

     

       59
       59
       +
        

     

       60
       60
       +
        echo 'starting network'

     

       61
       61
       +
        

     

       62
       62
       +
       @@ -495,12 +493,10 @@ ifconfig -g carp carpdemote 128

     

       63
       63
       +
        

     

       64
       64
       +
        sh /etc/netstart

     

       65
       65
       +
        

     

       66
       66
       +
       -start_daemon unwind >/dev/null 2>&1

     

       67
       67
       +
       +daemon_phase 30

     

       68
       68
       +
        

     

       69
       69
       +
        random_seed

     

       70
       70
       +
        

     

       71
       71
       +
       -wait_reorder_libs

     

       72
       72
       +
       -

     

       73
       73
       +
        # Load pf rules and bring up pfsync interface.

     

       74
       74
       +
        if [[ $pf != NO ]]; then

     

       75
       75
       +
        	if [[ -f /etc/pf.conf ]]; then

     

       76
       76
       +
       @@ -522,8 +518,7 @@ dmesg >/var/run/dmesg.boot

     

       77
       77
       +
        make_keys

     

       78
       78
       +
        

     

       79
       79
       +
        echo -n 'starting early daemons:'

     

       80
       80
       +
       -start_daemon syslogd ldattach pflogd nsd unbound ntpd

     

       81
       81
       +
       -start_daemon iscsid isakmpd iked sasyncd ldapd npppd

     

       82
       82
       +
       +daemon_phase 40

     

       83
       83
       +
        echo '.'

     

       84
       84
       +
        

     

       85
       85
       +
        # Load IPsec rules.

     

       86
       86
       +
       @@ -532,11 +527,7 @@ if [[ $ipsec != NO && -f /etc/ipsec.conf ]]; then

     

       87
       87
       +
        fi

     

       88
       88
       +
        

     

       89
       89
       +
        echo -n 'starting RPC daemons:'

     

       90
       90
       +
       -start_daemon portmap

     

       91
       91
       +
       -if [[ -n $(domainname) ]]; then

     

       92
       92
       +
       -	start_daemon ypldap ypserv ypbind

     

       93
       93
       +
       -fi

     

       94
       94
       +
       -start_daemon mountd nfsd lockd statd amd

     

       95
       95
       +
       +daemon_phase 50

     

       96
       96
       +
        echo '.'

     

       97
       97
       +
        

     

       98
       98
       +
        # Check and mount remaining file systems and enable additional swap.

     

       99
       99
       +
       @@ -626,43 +617,24 @@ echo 'preserving editor files.'; /usr/libexec/vi.recover

     

       100
       100
       +
        run_upgrade_script sysmerge

     

       101
       101
       +
        

     

       102
       102
       +
        echo -n 'starting network daemons:'

     

       103
       103
       +
       -start_daemon ldomd sshd snmpd ldpd ripd ospfd ospf6d bgpd ifstated

     

       104
       104
       +
       -start_daemon relayd dhcpd dhcrelay mrouted dvmrpd radiusd eigrpd route6d

     

       105
       105
       +
       -start_daemon rad hostapd lpd smtpd slowcgi bgplgd httpd ftpd

     

       106
       106
       +
       -start_daemon ftpproxy ftpproxy6 tftpd tftpproxy identd inetd rarpd bootparamd

     

       107
       107
       +
       -start_daemon rbootd mopd vmd spamd spamlogd sndiod

     

       108
       108
       +
       +daemon_phase 60

     

       109
       109
       +
        echo '.'

     

       110
       110
       +
        

     

       111
       111
       +
        # If rc.firsttime exists, run it just once, and make sure it is deleted.

     

       112
       112
       +
        run_upgrade_script firsttime

     

       113
       113
       +
        

     

       114
       114
       +
       -# Run rc.d(8) scripts from packages.

     

       115
       115
       +
       -if [[ -n $pkg_scripts ]]; then

     

       116
       116
       +
       -	echo -n 'starting package daemons:'

     

       117
       117
       +
       -	for _daemon in $pkg_scripts; do

     

       118
       118
       +
       -		if [[ -x /etc/rc.d/$_daemon ]]; then

     

       119
       119
       +
       -			start_daemon $_daemon

     

       120
       120
       +
       -		else

     

       121
       121
       +
       -			echo -n " ${_daemon}(absent)"

     

       122
       122
       +
       -		fi

     

       123
       123
       +
       -	done

     

       124
       124
       +
       -	echo '.'

     

       125
       125
       +
       -fi

     

       126
       126
       +
       -

     

       127
       127
       +
        [[ -f /etc/rc.local ]] && sh /etc/rc.local

     

       128
       128
       +
        

     

       129
       129
       +
       +daemon_phase 70

     

       130
       130
       +
       +

     

       131
       131
       +
        # Disable carp interlock.

     

       132
       132
       +
        ifconfig -g carp -carpdemote 128

     

       133
       133
       +
        

     

       134
       134
       +
        mixerctl_conf

     

       135
       135
       +
        

     

       136
       136
       +
        echo -n 'starting local daemons:'

     

       137
       137
       +
       -start_daemon apmd sensorsd hotplugd watchdogd cron wsmoused xenodm

     

       138
       138
       +
       +daemon_phase 80

     

       139
       139
       +
        echo '.'

     

       140
       140
       +
        

     

       141
       141
       +
       -# Re-link the kernel, placing the objects in a random order.

     

       142
       142
       +
       -# Replace current with relinked kernel and inform root about it.

     

       143
       143
       +
       -/usr/libexec/reorder_kernel &

     

       144
       144
       +
       -

     

       145
       145
       +
        date

     

       146
       146
       +
        exit 0

+18

pkgs/os-specific/bsd/openbsd/pkgs/rc/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation,

     

       3
       3
       +
       }:

     

       4
       4
       +
       mkDerivation {

     

       5
       5
       +
         pname = "rc";

     

       6
       6
       +
         path = "etc";

     

       7
       7
       +
       

     

       8
       8
       +
         patches = [ ./boot-phases.patch ];

     

       9
       9
       +
       

     

       10
       10
       +
         buildPhase = ":";

     

       11
       11
       +
       

     

       12
       12
       +
         installPhase = ''

     

       13
       13
       +
           mkdir -p $out/etc/rc.d

     

       14
       14
       +
           cp rc $out/etc

     

       15
       15
       +
           cp rc.d/rc.subr $out/etc/rc.d

     

       16
       16
       +
           chmod +x $out/etc/rc

     

       17
       17
       +
         '';

     

       18
       18
       +
       }

pkgs/os-specific/bsd/openbsd/pkgs/reboot.nix

···

       1
       1
       +
       { mkDerivation }:

     

       2
       2
       +
       mkDerivation {

     

       3
       3
       +
         path = "sbin/reboot";

     

       4
       4
       +
       }

+12 -3

pkgs/os-specific/bsd/openbsd/pkgs/shutdown.nix

···

       1
       1
       -
       { mkDerivation }:

     

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation,

     

       3
       3
       +
         reboot,

     

       4
       4
       +
         wall,

     

       5
       5
       +
       }:

     

       2
       6
        
       mkDerivation {

     

       3
       7
        
         path = "sbin/shutdown";

     

       4
       8
        
       

     

       5
       5
       -
         preBuild = ''

     

       6
       6
       -
           sed -i 's/4550/0550/' Makefile

     

       9
       9
       +
         postPatch = ''

     

       10
       10
       +
           sed -i 's/4550/0550/' $BSDSRCDIR/sbin/shutdown/Makefile

     

       11
       11
       +
       

     

       12
       12
       +
           substituteInPlace $BSDSRCDIR/sbin/shutdown/pathnames.h \

     

       13
       13
       +
             --replace-fail /sbin/halt ${reboot}/bin/halt \

     

       14
       14
       +
             --replace-fail /sbin/reboot ${reboot}/bin/reboot \

     

       15
       15
       +
             --replace-fail /usr/bin/wall ${wall}/bin/wall

     

       7
       16
        
         '';

     

       8
       17
        
       }

+1 -2

pkgs/os-specific/bsd/openbsd/pkgs/vmstat.nix

···

       1
       1
       -
       { mkDerivation, libkvm }:

     

       1
       1
       +
       { mkDerivation }:

     

       2
       2
        
       mkDerivation {

     

       3
       3
        
         path = "usr.bin/vmstat";

     

       4
       4
        
       

     

       5
       5
       -
         buildInputs = [ libkvm ];

     

       6
       5
        
         postPatch = ''

     

       7
       6
        
           sed -i /DPADD/d $BSDSRCDIR/usr.bin/vmstat/Makefile

     

       8
       7
        
         '';

pkgs/os-specific/bsd/openbsd/pkgs/wall.nix

···

       1
       1
       +
       { mkDerivation }:

     

       2
       2
       +
       mkDerivation {

     

       3
       3
       +
         path = "usr.bin/wall";

     

       4
       4
       +
       

     

       5
       5
       +
         postPatch = ''

     

       6
       6
       +
           sed -i /BINMODE/d $BSDSRCDIR/usr.bin/wall/Makefile

     

       7
       7
       +
           sed -i /BINGRP/d $BSDSRCDIR/usr.bin/wall/Makefile

     

       8
       8
       +
         '';

     

       9
       9
       +
       }

pkgs/tools/compression/xz/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchurl,

     

       5
       5
       +
         autoreconfHook,

     

       5
       6
        
         enableStatic ? stdenv.hostPlatform.isStatic,

     

       6
       7
        
         writeScript,

     

       7
       8
        
         testers,

     
···

       36
       37
        
       

     

       37
       38
        
         enableParallelBuilding = true;

     

       38
       39
        
         doCheck = true;

     

       40
       40
       +
       

     

       41
       41
       +
         nativeBuildInputs = lib.optionals stdenv.hostPlatform.isOpenBSD [

     

       42
       42
       +
           autoreconfHook

     

       43
       43
       +
         ];

     

       39
       44
        
       

     

       40
       45
        
         # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion

     

       41
       46
        
         # necessary for FreeBSD code path in configure

pkgs/top-level/python-aliases.nix

···

       142
       142
        
         cx_Freeze = cx-freeze; # added 2023-08-02

     

       143
       143
        
         cx_oracle = cx-oracle; # added 2024-01-03

     

       144
       144
        
         d2to1 = throw "d2to1 is archived and no longer works with setuptools v68"; # added 2023-07-30

     

       145
       145
       +
         dask-expr = throw "dask-expr was removed because its features are available in dask"; # added 2025-02-07

     

       145
       146
        
         dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24

     

       146
       147
        
         dash-renderer = throw "dash-renderer has been removed since it is abandoned"; # added 2025-01-01

     

       147
       148
        
         dateutil = python-dateutil; # added 2021-07-03

+2 -2

pkgs/top-level/python-packages.nix

···

       2961
       2961
        
       

     

       2962
       2962
        
         dask-awkward = callPackage ../development/python-modules/dask-awkward { };

     

       2963
       2963
        
       

     

       2964
       2964
       -
         dask-expr = callPackage ../development/python-modules/dask-expr { };

     

       2965
       2965
       -
       

     

       2966
       2964
        
         dask-gateway = callPackage ../development/python-modules/dask-gateway { };

     

       2967
       2965
        
       

     

       2968
       2966
        
         dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { };

     
···

       9746
       9744
        
         open-clip-torch = callPackage ../development/python-modules/open-clip-torch { };

     

       9747
       9745
        
       

     

       9748
       9746
        
         open-garage = callPackage ../development/python-modules/open-garage { };

     

       9747
       9747
       +
       

     

       9748
       9748
       +
         open-hypergraphs = callPackage ../development/python-modules/open-hypergraphs { };

     

       9749
       9749
        
       

     

       9750
       9750
        
         open-interpreter = callPackage ../development/python-modules/open-interpreter { };

     

       9751
       9751