commit a41310665415204dfa771f382e030da43f8e7fed · pyrox.dev/nixpkgs

+1

nixos/tests/forgejo.nix

···

       34
       34
        
             meta.maintainers = with lib.maintainers; [

     

       35
       35
        
               bendlas

     

       36
       36
        
               emilylange

     

       37
       37
       +
               tebriel

     

       37
       38
        
             ];

     

       38
       39
        
       

     

       39
       40
        
             nodes = {

+6 -1

pkgs/applications/editors/emacs/default.nix

···

       31
       31
        
             withPgtk = true;

     

       32
       32
        
           };

     

       33
       33
        
       

     

       34
       34
       -
           emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs;

     

       34
       34
       +
           emacs29-macport = callPackage (self.sources.emacs29-macport) (

     

       35
       35
       +
             inheritedArgs

     

       36
       36
       +
             // {

     

       37
       37
       +
               srcRepo = true;

     

       38
       38
       +
             }

     

       39
       39
       +
           );

     

       35
       40
        
         }

     

       36
       41
        
       )

+8

pkgs/applications/editors/emacs/macport-noescape-noop/CoreFoundation/CFBase.h

···

       1
       1
       +
       #if !defined(__COREFOUNDATION_CFBASE__)

     

       2
       2
       +
       

     

       3
       3
       +
       #include_next <CoreFoundation/CFBase.h>

     

       4
       4
       +
       

     

       5
       5
       +
       #undef CF_NOESCAPE

     

       6
       6
       +
       #define CF_NOESCAPE

     

       7
       7
       +
       

     

       8
       8
       +
       #endif

-31

pkgs/applications/editors/emacs/macport_noescape_noop.h

···

       1
       1
       -
       #ifndef NOESCAPE_NOOP_H_

     

       2
       2
       -
       #define NOESCAPE_NOOP_H_

     

       3
       3
       -
       

     

       4
       4
       -
       // First, do some work to get definitions for *_WIDTH. Normally, Emacs would

     

       5
       5
       -
       // have these defined by headers in-tree, but clang's headers clash with those.

     

       6
       6
       -
       // Due to how include paths work, we have to include clang headers if we want to

     

       7
       7
       -
       // mess with CoreFoundation definitions.

     

       8
       8
       -
       #pragma push_macro("__STDC_VERSION__")

     

       9
       9
       -
       // Make the preprocessor think that we're on C2x. The macros we want are gated

     

       10
       10
       -
       // on it.

     

       11
       11
       -
       #undef __STDC_VERSION__

     

       12
       12
       -
       #define __STDC_VERSION__ 202000L

     

       13
       13
       -
       // Include limits.h first, as stdint.h includes it.

     

       14
       14
       -
       #include <limits.h>

     

       15
       15
       -
       

     

       16
       16
       -
       // XX: clang's stdint.h is shy and won't give us its defs unless it thinks it's

     

       17
       17
       -
       // in freestanding mode.

     

       18
       18
       -
       #undef __STDC_HOSTED__

     

       19
       19
       -
       #include <stdint.h>

     

       20
       20
       -
       #define __STDC_HOSTED__ 1

     

       21
       21
       -
       

     

       22
       22
       -
       #pragma pop_macro("__STDC_VERSION__")

     

       23
       23
       -
       

     

       24
       24
       -
       // Now, pull in the header that defines CF_NOESCAPE.

     

       25
       25
       -
       #include <CoreFoundation/CFBase.h>

     

       26
       26
       -
       

     

       27
       27
       -
       // Redefine CF_NOESCAPE as empty.

     

       28
       28
       -
       #undef CF_NOESCAPE

     

       29
       29
       -
       #define CF_NOESCAPE

     

       30
       30
       -
       

     

       31
       31
       -
       #endif // NOESCAPE_NOOP_H_

+2 -7

pkgs/applications/editors/emacs/make-emacs.nix

···

       45
       45
        
         libtiff,

     

       46
       46
        
         libwebp,

     

       47
       47
        
         libxml2,

     

       48
       48
       -
         llvmPackages_14,

     

       49
       48
        
         m17n_lib,

     

       50
       49
        
         mailcap,

     

       51
       50
        
         mailutils,

     
···

       139
       138
        
         ++ lib.optionals (stdenv.cc ? cc.lib.libgcc) [

     

       140
       139
        
           "${lib.getLib stdenv.cc.cc.lib.libgcc}/lib"

     

       141
       140
        
         ];

     

       142
       142
       -
       

     

       143
       143
       -
         inherit (if variant == "macport" then llvmPackages_14.stdenv else stdenv)

     

       144
       144
       -
           mkDerivation

     

       145
       145
       -
           ;

     

       146
       141
        
       in

     

       147
       147
       -
       mkDerivation (finalAttrs: {

     

       142
       142
       +
       stdenv.mkDerivation (finalAttrs: {

     

       148
       143
        
         pname =

     

       149
       144
        
           pname

     

       150
       145
        
           + (

     
···

       430
       425
        
           // lib.optionalAttrs (variant == "macport") {

     

       431
       426
        
             # Fixes intermittent segfaults when compiled with LLVM >= 7.0.

     

       432
       427
        
             # See https://github.com/NixOS/nixpkgs/issues/127902

     

       433
       433
       -
             NIX_CFLAGS_COMPILE = "-include ${./macport_noescape_noop.h}";

     

       428
       428
       +
             NIX_CFLAGS_COMPILE = "-isystem ${./macport-noescape-noop}";

     

       434
       429
        
           };

     

       435
       430
        
       

     

       436
       431
        
         enableParallelBuilding = true;

+3 -1

pkgs/applications/virtualization/virt-top/default.nix

···

       7
       7
        
         libxml2,

     

       8
       8
        
         pkg-config,

     

       9
       9
        
         getopt,

     

       10
       10
       +
         gettext,

     

       10
       11
        
       }:

     

       11
       12
        
       

     

       12
       13
        
       stdenv.mkDerivation rec {

     
···

       43
       44
        
           ]

     

       44
       45
        
           ++ [ libxml2 ];

     

       45
       46
        
       

     

       46
       46
       -
         prePatch = ''

     

       47
       47
       +
         postPatch = ''

     

       47
       48
        
           substituteInPlace ocaml-dep.sh.in --replace-fail '#!/bin/bash' '#!${stdenv.shell}'

     

       48
       49
        
           substituteInPlace ocaml-link.sh.in --replace-fail '#!/bin/bash' '#!${stdenv.shell}'

     

       50
       50
       +
           substituteInPlace configure.ac --replace-fail 'AC_CONFIG_MACRO_DIR([m4])' 'AC_CONFIG_MACRO_DIRS([m4 ${gettext}/share/gettext/m4])'

     

       49
       51
        
         '';

     

       50
       52
        
       

     

       51
       53
        
         meta = {

+2 -2

pkgs/by-name/ar/arkade/package.nix

···

       7
       7
        
       

     

       8
       8
        
       buildGoModule rec {

     

       9
       9
        
         pname = "arkade";

     

       10
       10
       -
         version = "0.11.41";

     

       10
       10
       +
         version = "0.11.43";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "alexellis";

     

       14
       14
        
           repo = "arkade";

     

       15
       15
        
           rev = version;

     

       16
       16
       -
           hash = "sha256-N9NiAsggIJpYe2UfREp5l1srzm+P2LNIQhKJyT7w0rQ=";

     

       16
       16
       +
           hash = "sha256-zHKLk9dLZZiH7pH5FR6+uHP9ZteMsAFyrf4V7I+vgSs=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         env.CGO_ENABLED = 0;

+5 -5

pkgs/by-name/cl/clouddrive2/package.nix

···

       11
       11
        
       in

     

       12
       12
        
       stdenv.mkDerivation (finalAttrs: {

     

       13
       13
        
         pname = "clouddrive2";

     

       14
       14
       -
         version = "0.9.5";

     

       14
       14
       +
         version = "0.9.8";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";

     

       18
       18
        
           hash =

     

       19
       19
        
             {

     

       20
       20
       -
               x86_64-linux = "sha256-Gsq5rvr0SeGxCRwAeeFRZBPOe32EIa7uO6SAIuinezA=";

     

       21
       21
       -
               aarch64-linux = "sha256-M+lCUzoiy/sImBZrOjjeP4eqG3F4wbkMQg9Ho3ELGFo=";

     

       22
       22
       -
               x86_64-darwin = "sha256-Uyz1wuHICSq5C+n3ZjPinZznhajd6QR36CZgQBm+QRE=";

     

       23
       23
       -
               aarch64-darwin = "sha256-ZQxRHTzLUAhnL1rRLR9l8Ix5XzxeTAds7XAmEgZ9Xmo=";

     

       20
       20
       +
               x86_64-linux = "sha256-dla1Mp+frV12v+OkGJwwcTfUKRcWy47tXYx6nWpHMhk=";

     

       21
       21
       +
               aarch64-linux = "sha256-GjR0zLGLvfZJMQgq9Hq3NQp7Y8QSXU4kW9cUIe5MxyM=";

     

       22
       22
       +
               x86_64-darwin = "sha256-pQjLwahjtw+lgLJbRpgGM4lbAfZCDtgJSVcqS6TDwug=";

     

       23
       23
       +
               aarch64-darwin = "sha256-by4reE2OH1Qz+Wn40QMVNZm2JsJHkoZ05OZZEnxGChI=";

     

       24
       24
        
             }

     

       25
       25
        
             .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");

     

       26
       26
        
         };

+1

pkgs/by-name/fo/forgejo-runner/package.nix

···

       99
       99
        
             adamcstephens

     

       100
       100
        
             emilylange

     

       101
       101
        
             christoph-heiss

     

       102
       102
       +
             tebriel

     

       102
       103
        
           ];

     

       103
       104
        
           mainProgram = "forgejo-runner";

     

       104
       105
        
         };

+1

pkgs/by-name/fo/forgejo/generic.nix

···

       199
       199
        
             adamcstephens

     

       200
       200
        
             marie

     

       201
       201
        
             pyrox0

     

       202
       202
       +
             tebriel

     

       202
       203
        
           ];

     

       203
       204
        
           broken = stdenv.hostPlatform.isDarwin;

     

       204
       205
        
           mainProgram = "gitea";

+3 -3

pkgs/by-name/ha/harbor-cli/package.nix

···

       9
       9
        
       

     

       10
       10
        
       buildGoModule (finalAttrs: {

     

       11
       11
        
         pname = "harbor-cli";

     

       12
       12
       -
         version = "0.0.10";

     

       12
       12
       +
         version = "0.0.11";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "goharbor";

     

       16
       16
        
           repo = "harbor-cli";

     

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

     

       18
       18
       -
           hash = "sha256-KIICM26SYmzySt5oqiFpsEGVw/ORJZ3K11VANWa81lw=";

     

       18
       18
       +
           hash = "sha256-Mfy1v6uefaFI059o11/GKaiswXwJJKAH1w6kbzd2Vkk=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         vendorHash = "sha256-Y2UIQWH78qsw1UE6NgeTm1Tdno78Bg6oxA9GyPLDjkQ=";

     

       21
       21
       +
         vendorHash = "sha256-/pBLFEGPewRNi/h5EyUueTyp5iTu2R5wLppiHSF3XxE=";

     

       22
       22
        
       

     

       23
       23
        
         excludedPackages = [

     

       24
       24
        
           "dagger"

+2 -2

pkgs/by-name/op/openxr-loader/package.nix

···

       16
       16
        
       

     

       17
       17
        
       stdenv.mkDerivation rec {

     

       18
       18
        
         pname = "openxr-loader";

     

       19
       19
       -
         version = "1.1.50";

     

       19
       19
       +
         version = "1.1.51";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "KhronosGroup";

     

       23
       23
        
           repo = "OpenXR-SDK-Source";

     

       24
       24
        
           tag = "release-${version}";

     

       25
       25
       -
           hash = "sha256-/5zw9tj7F0cxhzyIRf8njoYB9moJFYLEjDeqe0OBr34=";

     

       25
       25
       +
           hash = "sha256-NEArzegPZNL0zRbnUHrNbNhBtj0IJP+uha1ehzwB7wA=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

+12

pkgs/by-name/po/poetry/package.nix

···

       11
       11
        
           {

     

       12
       12
        
             poetry = self.callPackage ./unwrapped.nix { };

     

       13
       13
        
       

     

       14
       14
       +
             # Poetry 2.1.4 officially requires virtualenv >=20.26.6, <20.33.0

     

       15
       15
       +
             # otherwise will be incompatible with python312

     

       16
       16
       +
             # see: https://github.com/python-poetry/poetry/issues/10490

     

       17
       17
       +
             virtualenv = super.virtualenv.overridePythonAttrs (old: rec {

     

       18
       18
       +
               version = "20.30.0";

     

       19
       19
       +
               src = fetchPypi {

     

       20
       20
       +
                 inherit (old) pname;

     

       21
       21
       +
                 inherit version;

     

       22
       22
       +
                 hash = "sha256-gAhjFivKpUUKbk1yEElzDn8trgdyDgkCsOQEC9b5rag=";

     

       23
       23
       +
               };

     

       24
       24
       +
             });

     

       25
       25
       +
       

     

       14
       26
        
             # The versions of Poetry and poetry-core need to match exactly,

     

       15
       27
        
             # and poetry-core in nixpkgs requires a staging cycle to be updated,

     

       16
       28
        
             # so apply an override here.

-1

pkgs/by-name/po/poetry/unwrapped.nix

···

       60
       60
        
         pythonRelaxDeps = [

     

       61
       61
        
           "dulwich"

     

       62
       62
        
           "keyring"

     

       63
       63
       -
           "virtualenv"

     

       64
       63
        
         ];

     

       65
       64
        
       

     

       66
       65
        
         dependencies = [

+4 -4

pkgs/by-name/ti/tigerbeetle/package.nix

···

       10
       10
        
         platform =

     

       11
       11
        
           if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;

     

       12
       12
        
         hash = builtins.getAttr platform {

     

       13
       13
       -
           "universal-macos" = "sha256-Xwjmwpy9xOSXFlGegj6hXMJtIsYJFme2yhptiaZorGU=";

     

       14
       14
       -
           "x86_64-linux" = "sha256-VQ9fQh65GIktHW6BWsnQmQnGwg971KkwY8lgvJgw0YY=";

     

       15
       15
       -
           "aarch64-linux" = "sha256-nVGJxJlV+a5vpuCj1r3b1geggjwDammKKdp1Je7z4A8=";

     

       13
       13
       +
           "universal-macos" = "sha256-XVYnzs9BF35pdB9uKSoX/+DWa8drWls0rtrNO9IZJtE=";

     

       14
       14
       +
           "x86_64-linux" = "sha256-rNlAikb/DrFYnE/OEgTPz3G82bQCnySeOp6dZAWxFn4=";

     

       15
       15
       +
           "aarch64-linux" = "sha256-wNuy8hq9Zt2UP/4zI/lgkWHv3X/mIKhaKoN8b/WRS2U=";

     

       16
       16
        
         };

     

       17
       17
        
       in

     

       18
       18
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       19
       19
        
         pname = "tigerbeetle";

     

       20
       20
       -
         version = "0.16.55";

     

       20
       20
       +
         version = "0.16.57";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchzip {

     

       23
       23
        
           url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";

+13 -8

pkgs/development/compilers/llvm/common/libc/default.nix

···

       18
       18
        
       let

     

       19
       19
        
         pname = "libc";

     

       20
       20
        
       

     

       21
       21
       -
         src' = runCommand "${pname}-src-${version}" { } (''

     

       22
       22
       -
           mkdir -p "$out"

     

       23
       23
       -
           cp -r ${monorepoSrc}/cmake "$out"

     

       24
       24
       -
           cp -r ${monorepoSrc}/runtimes "$out"

     

       25
       25
       -
           cp -r ${monorepoSrc}/llvm "$out"

     

       26
       26
       -
           cp -r ${monorepoSrc}/compiler-rt "$out"

     

       27
       27
       -
           cp -r ${monorepoSrc}/${pname} "$out"

     

       28
       28
       -
         '');

     

       21
       21
       +
         src' = runCommand "${pname}-src-${version}" { } (

     

       22
       22
       +
           ''

     

       23
       23
       +
             mkdir -p "$out"

     

       24
       24
       +
             cp -r ${monorepoSrc}/cmake "$out"

     

       25
       25
       +
             cp -r ${monorepoSrc}/runtimes "$out"

     

       26
       26
       +
             cp -r ${monorepoSrc}/llvm "$out"

     

       27
       27
       +
             cp -r ${monorepoSrc}/compiler-rt "$out"

     

       28
       28
       +
             cp -r ${monorepoSrc}/${pname} "$out"

     

       29
       29
       +
           ''

     

       30
       30
       +
           + lib.optionalString (lib.versionAtLeast release_version "21") ''

     

       31
       31
       +
             cp -r ${monorepoSrc}/third-party "$out"

     

       32
       32
       +
           ''

     

       33
       33
       +
         );

     

       29
       34
        
       in

     

       30
       35
        
       stdenv.mkDerivation (finalAttrs: {

     

       31
       36
        
         inherit pname version patches;

+1 -1

pkgs/development/compilers/llvm/default.nix

···

       31
       31
        
           "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";

     

       32
       32
        
           "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";

     

       33
       33
        
           "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";

     

       34
       34
       -
           "21.1.0-rc3".officialRelease.sha256 = "sha256-quZuqDIm8OrkDJqu7vJKUP8MF1xCuQNFwW9SnKMFoS8=";

     

       34
       34
       +
           "21.1.0".officialRelease.sha256 = "sha256-4DLEZuhREHMl2t0f1iqvXSRSE5VBMVxd94Tj4m8Yf9s=";

     

       35
       35
        
           "22.0.0-git".gitRelease = {

     

       36
       36
        
             rev = "0b42e117c829c6e127ef4b1bd82807ba01853128";

     

       37
       37
        
             rev-version = "22.0.0-unstable-2025-08-31";

+5

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

···

       49
       49
        
           hash = "sha256-T58J/Gi3tHzelr4enbYJi1KmO46QxE5Zlhkc0+EgvRg=";

     

       50
       50
        
         };

     

       51
       51
        
       

     

       52
       52
       +
         patches = [

     

       53
       53
       +
           # <https://github.com/librosa/librosa/pull/1977>

     

       54
       54
       +
           ./fix-with-numba-0.62.0.patch

     

       55
       55
       +
         ];

     

       56
       56
       +
       

     

       52
       57
        
         build-system = [ setuptools ];

     

       53
       58
        
       

     

       54
       59
        
         dependencies = [

+27

pkgs/development/python-modules/librosa/fix-with-numba-0.62.0.patch

···

       1
       1
       +
       From 902bcca8cfc84801cf93a6c3ca59da283072a79f Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Emily <hello@emily.moe>

     

       3
       3
       +
       Date: Wed, 27 Aug 2025 18:58:07 +0100

     

       4
       4
       +
       Subject: [PATCH] Fix types in beat tracking code

     

       5
       5
       +
       

     

       6
       6
       +
       The development version of Numba 0.62.0 is unhappy about `range`

     

       7
       7
       +
       being applied to floating point values here.

     

       8
       8
       +
       ---

     

       9
       9
       +
        librosa/beat.py | 2 +-

     

       10
       10
       +
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       11
       11
       +
       

     

       12
       12
       +
       diff --git a/librosa/beat.py b/librosa/beat.py

     

       13
       13
       +
       index 1a19005d..4ed9e945 100644

     

       14
       14
       +
       --- a/librosa/beat.py

     

       15
       15
       +
       +++ b/librosa/beat.py

     

       16
       16
       +
       @@ -582,7 +582,7 @@ def __beat_track_dp(localscore, frames_per_beat, tightness, backlink, cumscore):

     

       17
       17
       +
                # Search over all possible predecessors to find the best preceding beat

     

       18
       18
       +
                # NOTE: to provide time-varying tempo estimates, we replace

     

       19
       19
       +
                # frames_per_beat[0] by frames_per_beat[i] in this loop body.

     

       20
       20
       +
       -        for loc in range(i - np.round(frames_per_beat[tv * i] / 2), i - 2 * frames_per_beat[tv * i] - 1, - 1):

     

       21
       21
       +
       +        for loc in range(i - round(frames_per_beat[tv * i] / 2), int(i - 2 * frames_per_beat[tv * i] - 1), - 1):

     

       22
       22
       +
                    # Once we're searching past the start, break out

     

       23
       23
       +
                    if loc < 0:

     

       24
       24
       +
                        break

     

       25
       25
       +
       -- 

     

       26
       26
       +
       2.50.1

     

       27
       27
       +

+20 -12

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

···

       8
       8
        
       

     

       9
       9
        
         setuptools,

     

       10
       10
        
       

     

       11
       11
       +
         cmake,

     

       12
       12
       +
         ninja,

     

       13
       13
       +
       

     

       14
       14
       +
         llvm_20,

     

       15
       15
       +
         libxml2,

     

       16
       16
       +
       

     

       11
       17
        
         # tests

     

       12
       18
        
         pytestCheckHook,

     

       13
       13
       -
         llvm,

     

       14
       14
       -
         libxml2,

     

       15
       19
        
       

     

       16
       20
        
         withStaticLLVM ? true,

     

       17
       21
        
       }:

     

       18
       22
        
       

     

       23
       23
       +
       let

     

       24
       24
       +
         llvm = llvm_20;

     

       25
       25
       +
       in

     

       26
       26
       +
       

     

       19
       27
        
       buildPythonPackage rec {

     

       20
       28
        
         pname = "llvmlite";

     

       21
       21
       -
         version = "0.44.0";

     

       29
       29
       +
         version = "0.45.0rc1";

     

       22
       30
        
         pyproject = true;

     

       23
       31
        
       

     

       24
       32
        
         disabled = isPyPy || pythonAtLeast "3.14";

     
···

       27
       35
        
           owner = "numba";

     

       28
       36
        
           repo = "llvmlite";

     

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

     

       30
       30
       -
           hash = "sha256-ZIA/JfK9ZP00Zn6SZuPus30Xw10hn3DArHCkzBZAUV0=";

     

       38
       38
       +
           hash = "sha256-wMTNtUuslCjopyfF6FAtfJAR0zuWjL8N8G16UKiplN0=";

     

       31
       39
        
         };

     

       32
       40
        
       

     

       33
       41
        
         build-system = [ setuptools ];

     

       34
       42
        
       

     

       35
       35
       -
         buildInputs = [ llvm ] ++ lib.optionals withStaticLLVM [ libxml2.dev ];

     

       36
       36
       -
       

     

       37
       37
       -
         postPatch = lib.optionalString withStaticLLVM ''

     

       38
       38
       -
           substituteInPlace ffi/build.py --replace-fail "--system-libs --libs all" "--system-libs --libs --link-static all"

     

       39
       39
       -
         '';

     

       43
       43
       +
         nativeBuildInputs = [

     

       44
       44
       +
           cmake

     

       45
       45
       +
           ninja

     

       46
       46
       +
         ];

     

       40
       47
        
       

     

       41
       41
       -
         # Set directory containing llvm-config binary

     

       42
       42
       -
         env.LLVM_CONFIG = "${llvm.dev}/bin/llvm-config";

     

       48
       48
       +
         buildInputs = [ llvm ] ++ lib.optionals withStaticLLVM [ libxml2.dev ];

     

       43
       49
        
       

     

       44
       50
        
         nativeCheckInputs = [ pytestCheckHook ];

     

       45
       51
        
       

     

       52
       52
       +
         dontUseCmakeConfigure = true;

     

       53
       53
       +
       

     

       46
       54
        
         # https://github.com/NixOS/nixpkgs/issues/255262

     

       47
       55
        
         preCheck = ''

     

       48
       56
        
           cd $out

     

       49
       57
        
         '';

     

       50
       58
        
       

     

       51
       51
       -
         __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ "/usr/lib/libm.dylib" ];

     

       59
       59
       +
         env.LLVMLITE_SHARED = !withStaticLLVM;

     

       52
       60
        
       

     

       53
       61
        
         passthru = lib.optionalAttrs (!withStaticLLVM) { inherit llvm; };

     

       54
       62

+16 -24

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

···

       33
       33
        
         cudatoolkit = cudaPackages.cuda_nvcc;

     

       34
       34
        
       in

     

       35
       35
        
       buildPythonPackage rec {

     

       36
       36
       -
         version = "0.61.2";

     

       36
       36
       +
         version = "0.62.0rc1";

     

       37
       37
        
         pname = "numba";

     

       38
       38
        
         pyproject = true;

     

       39
       39
        
       

     
···

       51
       51
        
           postFetch = ''

     

       52
       52
        
             sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' $out/numba/_version.py

     

       53
       53
        
           '';

     

       54
       54
       -
           hash = "sha256-Qa2B5pOWrLb/1V3PSyiwS1x9ueXwDKRhDMDecBCAN+8=";

     

       54
       54
       +
           hash = "sha256-YnozYetRsrCl5+UvK4y1QQykUqSMshi9vcv/K5A0dts=";

     

       55
       55
        
         };

     

       56
       56
        
       

     

       57
       57
        
         postPatch = ''

     
···

       59
       59
        
             --replace-fail \

     

       60
       60
        
               "dldir = [" \

     

       61
       61
        
               "dldir = [ '${addDriverRunpath.driverLink}/lib', "

     

       62
       62
       -
       

     

       63
       63
       -
           substituteInPlace setup.py \

     

       64
       64
       -
             --replace-fail 'max_numpy_run_version = "2.3"' 'max_numpy_run_version = "2.4"'

     

       65
       65
       -
           substituteInPlace numba/__init__.py \

     

       66
       66
       -
             --replace-fail "numpy_version > (2, 2)" "numpy_version > (2, 3)"

     

       67
       62
        
         '';

     

       68
       63
        
       

     

       69
       69
       -
         env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1";

     

       70
       70
       -
       

     

       71
       64
        
         build-system = [

     

       72
       65
        
           setuptools

     

       73
       66
        
           numpy

     
···

       80
       73
        
       

     

       81
       74
        
         buildInputs = lib.optionals cudaSupport [ cudaPackages.cuda_cudart ];

     

       82
       75
        
       

     

       83
       83
       -
         pythonRelaxDeps = [ "numpy" ];

     

       76
       76
       +
         pythonRelaxDeps = [

     

       77
       77
       +
           "numpy"

     

       78
       78
       +
         ];

     

       84
       79
        
       

     

       85
       80
        
         dependencies = [

     

       86
       81
        
           numpy

     

       87
       82
        
           llvmlite

     

       88
       83
        
         ];

     

       89
       84
        
       

     

       90
       90
       -
         patches = [

     

       91
       91
       -
           (fetchpatch2 {

     

       92
       92
       -
             url = "https://github.com/numba/numba/commit/e2c8984ba60295def17e363a926d6f75e7fa9f2d.patch";

     

       93
       93
       -
             includes = [ "numba/core/bytecode.py" ];

     

       94
       94
       -
             hash = "sha256-HIVbp3GSmnq6W7zrRIirIbhGjJsFN3PNyHSfAE8fdDw=";

     

       95
       95
       -
           })

     

       96
       96
       -
         ]

     

       97
       97
       -
         ++ lib.optionals cudaSupport [

     

       85
       85
       +
         patches = lib.optionals cudaSupport [

     

       98
       86
        
           (replaceVars ./cuda_path.patch {

     

       99
       87
        
             cuda_toolkit_path = cudatoolkit;

     

       100
       88
        
             cuda_toolkit_lib_path = lib.getLib cudatoolkit;

     
···

       111
       99
        
           cd $out

     

       112
       100
        
         '';

     

       113
       101
        
       

     

       114
       114
       -
         enabledTestPaths = lib.optionals (!doFullCheck) [

     

       115
       115
       -
           # These are the most basic tests. Running all tests is too expensive, and

     

       116
       116
       -
           # some of them fail (also differently on different platforms), so it will

     

       117
       117
       -
           # be too hard to maintain such a `disabledTests` list.

     

       118
       118
       -
           "${python.sitePackages}/numba/tests/test_usecases.py"

     

       119
       119
       -
         ];

     

       102
       102
       +
         enabledTestPaths =

     

       103
       103
       +
           if doFullCheck then

     

       104
       104
       +
             null

     

       105
       105
       +
           else

     

       106
       106
       +
             [

     

       107
       107
       +
               # These are the most basic tests. Running all tests is too expensive, and

     

       108
       108
       +
               # some of them fail (also differently on different platforms), so it will

     

       109
       109
       +
               # be too hard to maintain such a `disabledTests` list.

     

       110
       110
       +
               "${python.sitePackages}/numba/tests/test_usecases.py"

     

       111
       111
       +
             ];

     

       120
       112
        
       

     

       121
       113
        
         disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [

     

       122
       114
        
           # captured stderr: Fatal Python error: Segmentation fault

+2 -2

pkgs/tools/package-management/nix/default.nix

···

       165
       165
        
             nix_2_30 = addTests "nix_2_30" self.nixComponents_2_30.nix-everything;

     

       166
       166
        
       

     

       167
       167
        
             nixComponents_2_31 = nixDependencies.callPackage ./modular/packages.nix rec {

     

       168
       168
       -
               version = "2.31.0";

     

       168
       168
       +
               version = "2.31.1";

     

       169
       169
        
               inherit (self.nix_2_30.meta) maintainers teams;

     

       170
       170
        
               otherSplices = generateSplicesForNixComponents "nixComponents_2_31";

     

       171
       171
        
               src = fetchFromGitHub {

     

       172
       172
        
                 owner = "NixOS";

     

       173
       173
        
                 repo = "nix";

     

       174
       174
        
                 tag = version;

     

       175
       175
       -
                 hash = "sha256-5JYyijH2q/uQCDIZCCyQEBsZ0VPNP2SS1wgZ4+qeIWM=";

     

       175
       175
       +
                 hash = "sha256-p7GXuu9OyQ1etTYl5egWIk2Ck7CdpXj80CqkhfE4H0c=";

     

       176
       176
        
               };

     

       177
       177
        
             };

     

       178
       178

+1 -2

pkgs/top-level/python-packages.nix

···

       8641
       8641
        
         llmx = callPackage ../development/python-modules/llmx { };

     

       8642
       8642
        
       

     

       8643
       8643
        
         llvmlite = callPackage ../development/python-modules/llvmlite {

     

       8644
       8644
       -
           # llvmlite always requires a specific version of llvm.

     

       8645
       8645
       -
           llvm = pkgs.llvm_16;

     

       8644
       8644
       +
           inherit (pkgs) cmake ninja;

     

       8646
       8645
        
         };

     

       8647
       8646
        
       

     

       8648
       8647
        
         lm-eval = callPackage ../development/python-modules/lm-eval { };