commit ca6fee2e3c43290fd2df5e67a4a8f77e16a354c6 · pyrox.dev/nixpkgs

+4 -1

nixos/modules/services/desktop-managers/lomiri.nix

···

       125
        
                   lomiri-thumbnailer

     

       126
        
                   lomiri-url-dispatcher

     

       127
        
                   mediascanner2 # TODO possibly needs to be kicked off by graphical-session.target

     

       128
       -
                   morph-browser

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       129
        
                   qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session

     

       130
        
                   teleports

     

       131
        
                 ]);

···

       125
        
                   lomiri-thumbnailer

     

       126
        
                   lomiri-url-dispatcher

     

       127
        
                   mediascanner2 # TODO possibly needs to be kicked off by graphical-session.target

     

       128
       +
                   # Qt5 qtwebengine is not secure: https://github.com/NixOS/nixpkgs/pull/435067

     

       129
       +
                   # morph-browser

     

       130
       +
                   # Adding another browser that is known-working until Morph Browser can migrate to Qt6

     

       131
       +
                   pkgs.epiphany

     

       132
        
                   qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session

     

       133
        
                   teleports

     

       134
        
                 ]);

+9 -1

nixos/modules/services/scheduling/scx.nix

···

       39
        
           scheduler = lib.mkOption {

     

       40
        
             type = lib.types.enum [

     

       41
        
               "scx_bpfland"

     

       0
        
       
     

       0
        
       
     

       42
        
               "scx_central"

     

       43
        
               "scx_flash"

     

       44
        
               "scx_flatcg"

     
···

       46
        
               "scx_layered"

     

       47
        
               "scx_mitosis"

     

       48
        
               "scx_nest"

     

       0
        
       
     

       49
        
               "scx_pair"

     

       0
        
       
     

       50
        
               "scx_qmap"

     

       51
        
               "scx_rlfifo"

     

       52
        
               "scx_rustland"

     

       53
        
               "scx_rusty"

     

       54
        
               "scx_sdt"

     

       55
        
               "scx_simple"

     

       0
        
       
     

       56
        
               "scx_userland"

     

       0
        
       
     

       57
        
             ];

     

       58
        
             default = "scx_rustland";

     

       59
        
             example = "scx_bpfland";

     
···

       115
        
           ];

     

       116
        
         };

     

       117
        
       

     

       118
       -
         meta.maintainers = with lib.maintainers; [ johnrtitor ];

     

       0
        
       
     

       0
        
       
     

       119
        
       }

···

       39
        
           scheduler = lib.mkOption {

     

       40
        
             type = lib.types.enum [

     

       41
        
               "scx_bpfland"

     

       42
       +
               "scx_chaos"

     

       43
       +
               "scx_cosmos"

     

       44
        
               "scx_central"

     

       45
        
               "scx_flash"

     

       46
        
               "scx_flatcg"

     
···

       48
        
               "scx_layered"

     

       49
        
               "scx_mitosis"

     

       50
        
               "scx_nest"

     

       51
       +
               "scx_p2dq"

     

       52
        
               "scx_pair"

     

       53
       +
               "scx_prev"

     

       54
        
               "scx_qmap"

     

       55
        
               "scx_rlfifo"

     

       56
        
               "scx_rustland"

     

       57
        
               "scx_rusty"

     

       58
        
               "scx_sdt"

     

       59
        
               "scx_simple"

     

       60
       +
               "scx_tickless"

     

       61
        
               "scx_userland"

     

       62
       +
               "scx_wd40"

     

       63
        
             ];

     

       64
        
             default = "scx_rustland";

     

       65
        
             example = "scx_bpfland";

     
···

       121
        
           ];

     

       122
        
         };

     

       123
        
       

     

       124
       +
         meta = {

     

       125
       +
           inherit (pkgs.scx.full.meta) maintainers;

     

       126
       +
         };

     

       127
        
       }

+4 -3

nixos/modules/system/boot/systemd.nix

···

       107
        
           # Maintaining state across reboots.

     

       108
        
           "systemd-random-seed.service"

     

       109
        
         ]

     

       110
       -
         ++ (optional cfg.package.withBootloader "systemd-boot-random-seed.service")

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       111
        
         ++ [

     

       112
        
           "systemd-backlight@.service"

     

       113
        
           "systemd-rfkill.service"

     

       114
        
           "systemd-rfkill.socket"

     

       115
        
       

     

       116
       -
           # Boot counting

     

       117
        
           "boot-complete.target"

     

       118
       -
           "systemd-bless-boot.service"

     

       119
        
       

     

       120
        
           # Hibernate / suspend.

     

       121
        
           "hibernate.target"

···

       107
        
           # Maintaining state across reboots.

     

       108
        
           "systemd-random-seed.service"

     

       109
        
         ]

     

       110
       +
         ++ optionals cfg.package.withBootloader [

     

       111
       +
           "systemd-boot-random-seed.service"

     

       112
       +
           "systemd-bless-boot.service"

     

       113
       +
         ]

     

       114
        
         ++ [

     

       115
        
           "systemd-backlight@.service"

     

       116
        
           "systemd-rfkill.service"

     

       117
        
           "systemd-rfkill.socket"

     

       118
        
       

     

       0
        
       
     

       119
        
           "boot-complete.target"

     

       0
        
       
     

       120
        
       

     

       121
        
           # Hibernate / suspend.

     

       122
        
           "hibernate.target"

+18 -16

nixos/tests/lomiri.nix

···

       431
        
                     machine.send_key("alt-f4")

     

       432
        
       

     

       433
        
                 # Morph is how we go online

     

       434
       -
                 with subtest("morph browser works"):

     

       435
       -
                     open_starter()

     

       436
       -
                     machine.send_chars("Morph\n")

     

       437
       -
                     wait_for_text(r"(Bookmarks|address|site|visited any)")

     

       438
       -
                     machine.screenshot("morph_open")

     

       439
       -
       

     

       440
       -
                     # morph-browser has a separate VM test to test its basic functionalities

     

       441
       -
       

     

       442
       -
                     machine.send_key("alt-f4")

     

       0
        
       
     

       443
        
       

     

       444
        
                 # LSS provides DE settings

     

       445
        
                 with subtest("system settings open"):

     
···

       613
        
                     machine.send_key("ret")

     

       614
        
       

     

       615
        
                     # Peers should be loaded

     

       616
       -
                     wait_for_text("Morph") # or Gallery, but Morph is already packaged

     

       617
        
                     machine.screenshot("settings_lomiri-content-hub_peers")

     

       618
        
       

     

       619
       -
                     # Select Morph as content source

     

       620
       -
                     mouse_click(340, 80)

     

       621
        
       

     

       622
       -
                     # Expect Morph to be brought into the foreground, with its Downloads page open

     

       623
       -
                     wait_for_text("No downloads")

     

       624
        
       

     

       625
        
                     # If lomiri-content-hub encounters a problem, it may have crashed the original application issuing the request.

     

       626
        
                     # Check that it's still alive

     
···

       629
        
                     machine.screenshot("lomiri-content-hub_exchange")

     

       630
        
       

     

       631
        
                     # Testing any more would require more applications & setup, the fact that it's already being attempted is a good sign

     

       632
       -
                     machine.send_key("esc")

     

       0
        
       
     

       633
        
       

     

       634
       -
                     machine.sleep(2) # sleep a tiny bit so morph can close & the focus can return to LSS

     

       635
        
                     machine.send_key("alt-f4")

     

       636
        
               '';

     

       637
        
           }

···

       431
        
                     machine.send_key("alt-f4")

     

       432
        
       

     

       433
        
                 # Morph is how we go online

     

       434
       +
                 # Qt5 qtwebengine is not secure: https://github.com/NixOS/nixpkgs/pull/435067

     

       435
       +
                 # with subtest("morph browser works"):

     

       436
       +
                 #     open_starter()

     

       437
       +
                 #     machine.send_chars("Morph\n")

     

       438
       +
                 #     wait_for_text(r"(Bookmarks|address|site|visited any)")

     

       439
       +
                 #     machine.screenshot("morph_open")

     

       440
       +
                 #

     

       441
       +
                 #     # morph-browser has a separate VM test to test its basic functionalities

     

       442
       +
                 #

     

       443
       +
                 #     machine.send_key("alt-f4")

     

       444
        
       

     

       445
        
                 # LSS provides DE settings

     

       446
        
                 with subtest("system settings open"):

     
···

       614
        
                     machine.send_key("ret")

     

       615
        
       

     

       616
        
                     # Peers should be loaded

     

       617
       +
                     wait_for_text("Gallery")

     

       618
        
                     machine.screenshot("settings_lomiri-content-hub_peers")

     

       619
        
       

     

       620
       +
                     # Select Gallery as content source

     

       621
       +
                     mouse_click(460, 80)

     

       622
        
       

     

       623
       +
                     # Expect Gallery to be brought into the foreground, with its sharing page open

     

       624
       +
                     wait_for_text("Photos")

     

       625
        
       

     

       626
        
                     # If lomiri-content-hub encounters a problem, it may have crashed the original application issuing the request.

     

       627
        
                     # Check that it's still alive

     
···

       630
        
                     machine.screenshot("lomiri-content-hub_exchange")

     

       631
        
       

     

       632
        
                     # Testing any more would require more applications & setup, the fact that it's already being attempted is a good sign

     

       633
       +
                     machine.send_key("tab")

     

       634
       +
                     machine.send_key("ret")

     

       635
        
       

     

       636
       +
                     machine.sleep(2) # sleep a tiny bit so gallery can close & the focus can return to LSS

     

       637
        
                     machine.send_key("alt-f4")

     

       638
        
               '';

     

       639
        
           }

+13 -3

nixos/tests/scx/default.nix

···

       12
        
       

     

       13
        
           specialisation = {

     

       14
        
             bpfland.configuration.services.scx.scheduler = "scx_bpfland";

     

       15
       -
             central.configuration.services.scx.scheduler = "scx_central";

     

       0
        
       
     

       0
        
       
     

       16
        
             lavd.configuration.services.scx.scheduler = "scx_lavd";

     

       0
        
       
     

       0
        
       
     

       17
        
             rlfifo.configuration.services.scx.scheduler = "scx_rlfifo";

     

       18
        
             rustland.configuration.services.scx.scheduler = "scx_rustland";

     

       19
        
             rusty.configuration.services.scx.scheduler = "scx_rusty";

     

       0
        
       
     

       20
        
           };

     

       21
        
         };

     

       22
        
       

     

       23
        
         testScript = ''

     

       24
        
           specialisation = [

     

       25
        
             "bpfland",

     

       26
       -
             "central",

     

       0
        
       
     

       0
        
       
     

       27
        
             "lavd",

     

       0
        
       
     

       0
        
       
     

       28
        
             "rlfifo",

     

       29
        
             "rustland",

     

       30
       -
             "rusty"

     

       0
        
       
     

       31
        
           ]

     

       32
        
       

     

       33
        
           def activate_specialisation(name: str):

···

       12
        
       

     

       13
        
           specialisation = {

     

       14
        
             bpfland.configuration.services.scx.scheduler = "scx_bpfland";

     

       15
       +
             cosmos.configuration.services.scx.scheduler = "scx_cosmos";

     

       16
       +
             flash.configuration.services.scx.scheduler = "scx_flash";

     

       17
       +
             flatcg.configuration.services.scx.scheduler = "scx_flatcg";

     

       18
        
             lavd.configuration.services.scx.scheduler = "scx_lavd";

     

       19
       +
             nest.configuration.services.scx.scheduler = "scx_nest";

     

       20
       +
             p2dq.configuration.services.scx.scheduler = "scx_p2dq";

     

       21
        
             rlfifo.configuration.services.scx.scheduler = "scx_rlfifo";

     

       22
        
             rustland.configuration.services.scx.scheduler = "scx_rustland";

     

       23
        
             rusty.configuration.services.scx.scheduler = "scx_rusty";

     

       24
       +
             simple.configuration.services.scx.scheduler = "scx_simple";

     

       25
        
           };

     

       26
        
         };

     

       27
        
       

     

       28
        
         testScript = ''

     

       29
        
           specialisation = [

     

       30
        
             "bpfland",

     

       31
       +
             "cosmos",

     

       32
       +
             "flash",

     

       33
       +
             "flatcg",

     

       34
        
             "lavd",

     

       35
       +
             "nest",

     

       36
       +
             "p2dq",

     

       37
        
             "rlfifo",

     

       38
        
             "rustland",

     

       39
       +
             "rusty",

     

       40
       +
             "simple"

     

       41
        
           ]

     

       42
        
       

     

       43
        
           def activate_specialisation(name: str):

+4 -4

pkgs/applications/graphics/feh/default.nix pkgs/by-name/fe/feh/package.nix

···

       4
        
         fetchFromGitHub,

     

       5
        
         makeWrapper,

     

       6
        
         xorg,

     

       7
       -
         imlib2,

     

       8
        
         libjpeg,

     

       9
        
         libpng,

     

       10
        
         curl,

     
···

       16
        
       

     

       17
        
       stdenv.mkDerivation (finalAttrs: {

     

       18
        
         pname = "feh";

     

       19
       -
         version = "3.10.3";

     

       20
        
       

     

       21
        
         src = fetchFromGitHub {

     

       22
        
           owner = "derf";

     

       23
        
           repo = "feh";

     

       24
        
           rev = finalAttrs.version;

     

       25
       -
           hash = "sha256-FtaFoLjI3HTLAxRTucp5VDYS73UuWqw9r9UWKK6T+og=";

     

       26
        
         };

     

       27
        
       

     

       28
        
         outputs = [

     
···

       37
        
           xorg.libXt

     

       38
        
           xorg.libX11

     

       39
        
           xorg.libXinerama

     

       40
       -
           imlib2

     

       41
        
           libjpeg

     

       42
        
           libpng

     

       43
        
           curl

···

       4
        
         fetchFromGitHub,

     

       5
        
         makeWrapper,

     

       6
        
         xorg,

     

       7
       +
         imlib2Full,

     

       8
        
         libjpeg,

     

       9
        
         libpng,

     

       10
        
         curl,

     
···

       16
        
       

     

       17
        
       stdenv.mkDerivation (finalAttrs: {

     

       18
        
         pname = "feh";

     

       19
       +
         version = "3.11";

     

       20
        
       

     

       21
        
         src = fetchFromGitHub {

     

       22
        
           owner = "derf";

     

       23
        
           repo = "feh";

     

       24
        
           rev = finalAttrs.version;

     

       25
       +
           hash = "sha256-3QKKXgwrDXVn8ahIG+NfP60GezFrZiHWOFoM2T0OoqU=";

     

       26
        
         };

     

       27
        
       

     

       28
        
         outputs = [

     
···

       37
        
           xorg.libXt

     

       38
        
           xorg.libX11

     

       39
        
           xorg.libXinerama

     

       40
       +
           imlib2Full

     

       41
        
           libjpeg

     

       42
        
           libpng

     

       43
        
           curl

pkgs/applications/networking/p2p/gnunet/default.nix pkgs/by-name/gn/gnunet/package.nix

+2

pkgs/applications/networking/p2p/gnunet/gtk.nix pkgs/by-name/gn/gnunet-gtk/package.nix

···

       22
        
           hash = "sha256-rsQzMvOoQEuushd0jBGQt9j6zXj2G1SMax8d4QoDV6s=";

     

       23
        
         };

     

       24
        
       

     

       0
        
       
     

       0
        
       
     

       25
        
         nativeBuildInputs = [

     

       26
        
           pkg-config

     

       27
        
           wrapGAppsHook3

···

       22
        
           hash = "sha256-rsQzMvOoQEuushd0jBGQt9j6zXj2G1SMax8d4QoDV6s=";

     

       23
        
         };

     

       24
        
       

     

       25
       +
         strictDeps = true;

     

       26
       +
       

     

       27
        
         nativeBuildInputs = [

     

       28
        
           pkg-config

     

       29
        
           wrapGAppsHook3

+11

pkgs/by-name/ay/ayatana-indicator-sound/package.nix

···

       48
        
           # Build-time Vala codegen

     

       49
        
           substituteInPlace src/CMakeLists.txt \

     

       50
        
             --replace-fail '/usr/share/gir-1.0/AccountsService-1.0.gir' '${lib.getDev accountsservice}/share/gir-1.0/AccountsService-1.0.gir'

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       51
        
         '';

     

       52
        
       

     

       53
        
         strictDeps = true;

···

       48
        
           # Build-time Vala codegen

     

       49
        
           substituteInPlace src/CMakeLists.txt \

     

       50
        
             --replace-fail '/usr/share/gir-1.0/AccountsService-1.0.gir' '${lib.getDev accountsservice}/share/gir-1.0/AccountsService-1.0.gir'

     

       51
       +
       

     

       52
       +
           # timeouts are too short for aarch64 OfBorg builder under loads, which leads to spurious test failures

     

       53
       +
           substituteInPlace \

     

       54
       +
             tests/accounts-service-user.cc \

     

       55
       +
             tests/media-player-user.cc \

     

       56
       +
             tests/name-watch-test.cc \

     

       57
       +
             tests/notifications-test.cc \

     

       58
       +
             tests/volume-control-test.cc \

     

       59
       +
             --replace-quiet 'loop(50)' 'loop(500)' \

     

       60
       +
             --replace-quiet 'loop(100)' 'loop(1000)' \

     

       61
       +
             --replace-quiet 'loop(500)' 'loop(5000)' \

     

       62
        
         '';

     

       63
        
       

     

       64
        
         strictDeps = true;

+5

pkgs/by-name/ca/calibre/package.nix

···

       222
        
             $ETN 'test_qt'  # we don't include svg or webp support

     

       223
        
             $ETN 'test_import_of_all_python_modules'  # explores actual file paths, gets confused

     

       224
        
             $ETN 'test_websocket_basic'  # flakey

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       225
        
             ${lib.optionalString stdenv.hostPlatform.isAarch64 "$ETN 'test_piper'"} # https://github.com/microsoft/onnxruntime/issues/10038

     

       226
        
             ${lib.optionalString (!unrarSupport) "$ETN 'test_unrar'"}

     

       227
        
           )

···

       222
        
             $ETN 'test_qt'  # we don't include svg or webp support

     

       223
        
             $ETN 'test_import_of_all_python_modules'  # explores actual file paths, gets confused

     

       224
        
             $ETN 'test_websocket_basic'  # flakey

     

       225
       +
             # hangs with cuda enabled, also:

     

       226
       +
             # eglInitialize: Failed to get system egl display

     

       227
       +
             # Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory

     

       228
       +
             $ETN 'test_recipe_browser_webengine'

     

       229
       +
       

     

       230
        
             ${lib.optionalString stdenv.hostPlatform.isAarch64 "$ETN 'test_piper'"} # https://github.com/microsoft/onnxruntime/issues/10038

     

       231
        
             ${lib.optionalString (!unrarSupport) "$ETN 'test_unrar'"}

     

       232
        
           )

+4

pkgs/by-name/cc/ccache/package.nix

···

       158
        
                     ln -s ${unwrappedCC}/$file $out/$file

     

       159
        
                   done

     

       160
        
                 '';

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       161
        
             };

     

       162
        
       

     

       163
        
           updateScript = nix-update-script { };

···

       158
        
                     ln -s ${unwrappedCC}/$file $out/$file

     

       159
        
                   done

     

       160
        
                 '';

     

       161
       +
       

     

       162
       +
               meta = {

     

       163
       +
                 inherit (unwrappedCC.meta) mainProgram;

     

       164
       +
               };

     

       165
        
             };

     

       166
        
       

     

       167
        
           updateScript = nix-update-script { };

+4 -4

pkgs/by-name/cl/claude-code/package-lock.json

···

       6
        
         "packages": {

     

       7
        
           "": {

     

       8
        
             "dependencies": {

     

       9
       -
               "@anthropic-ai/claude-code": "^1.0.93"

     

       10
        
             }

     

       11
        
           },

     

       12
        
           "node_modules/@anthropic-ai/claude-code": {

     

       13
       -
             "version": "1.0.93",

     

       14
       -
             "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.93.tgz",

     

       15
       -
             "integrity": "sha512-HSrbuYVu4k1dwoj/IYsXEVSoMWDPujy2D4zl9BMt4Zt0kwUwZch0nHpTyQ0C+YeHMN7hHbViz0bw6spg0a5GgQ==",

     

       16
        
             "license": "SEE LICENSE IN README.md",

     

       17
        
             "bin": {

     

       18
        
               "claude": "cli.js"

···

       6
        
         "packages": {

     

       7
        
           "": {

     

       8
        
             "dependencies": {

     

       9
       +
               "@anthropic-ai/claude-code": "^1.0.95"

     

       10
        
             }

     

       11
        
           },

     

       12
        
           "node_modules/@anthropic-ai/claude-code": {

     

       13
       +
             "version": "1.0.95",

     

       14
       +
             "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.95.tgz",

     

       15
       +
             "integrity": "sha512-VLwfezJ8vnNpkdUdyMORQ1JXx/C7GFd8MLiJTXXThvMTxhNEr8IhAY/bExNrtdkWx2+aipGocRLgNZrUon9HMw==",

     

       16
        
             "license": "SEE LICENSE IN README.md",

     

       17
        
             "bin": {

     

       18
        
               "claude": "cli.js"

+3 -3

pkgs/by-name/cl/claude-code/package.nix

···

       7
        
       

     

       8
        
       buildNpmPackage rec {

     

       9
        
         pname = "claude-code";

     

       10
       -
         version = "1.0.93";

     

       11
        
       

     

       12
        
         nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin

     

       13
        
       

     

       14
        
         src = fetchzip {

     

       15
        
           url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";

     

       16
       -
           hash = "sha256-vEUty4HRPSkFpT94bxMWcLj0nFe34AeQEZ0WsCXuy10=";

     

       17
        
         };

     

       18
        
       

     

       19
       -
         npmDepsHash = "sha256-JL0GPIhpyTQonKsyMR5zN8LaPfX3KkEfQbMR1Z7gTFE=";

     

       20
        
       

     

       21
        
         postPatch = ''

     

       22
        
           cp ${./package-lock.json} package-lock.json

···

       7
        
       

     

       8
        
       buildNpmPackage rec {

     

       9
        
         pname = "claude-code";

     

       10
       +
         version = "1.0.95";

     

       11
        
       

     

       12
        
         nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin

     

       13
        
       

     

       14
        
         src = fetchzip {

     

       15
        
           url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";

     

       16
       +
           hash = "sha256-msAIwzvmzu9qherfXUAgyt7NMq+vZwhTKhu/9ksX6xs=";

     

       17
        
         };

     

       18
        
       

     

       19
       +
         npmDepsHash = "sha256-nUzpOO3GQ2ME0kwyTcqhy30OW0wOPlai2YX/GH8pgS4=";

     

       20
        
       

     

       21
        
         postPatch = ''

     

       22
        
           cp ${./package-lock.json} package-lock.json

+5 -2

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

···

       1
        
       {

     

       0
        
       
     

       2
        
         comma,

     

       3
        
         fetchFromGitHub,

     

       4
        
         installShellFiles,

     
···

       8
        
         nix,

     

       9
        
         rustPlatform,

     

       10
        
         testers,

     

       0
        
       
     

       11
        
       }:

     

       12
        
       

     

       13
        
       rustPlatform.buildRustPackage rec {

     
···

       48
        
             "$out/share/comma/command-not-found.nu" \

     

       49
        
             "$out/share/comma/command-not-found.fish" \

     

       50
        
             --replace-fail "comma --ask" "$out/bin/comma --ask"

     

       51
       -
       

     

       52
       -
           "$out/bin/comma" --mangen > comma.1

     

       0
        
       
     

       53
        
           installManPage comma.1

     

       54
        
         '';

     

       55

···

       1
        
       {

     

       2
       +
         stdenv,

     

       3
        
         comma,

     

       4
        
         fetchFromGitHub,

     

       5
        
         installShellFiles,

     
···

       9
        
         nix,

     

       10
        
         rustPlatform,

     

       11
        
         testers,

     

       12
       +
         buildPackages,

     

       13
        
       }:

     

       14
        
       

     

       15
        
       rustPlatform.buildRustPackage rec {

     
···

       50
        
             "$out/share/comma/command-not-found.nu" \

     

       51
        
             "$out/share/comma/command-not-found.fish" \

     

       52
        
             --replace-fail "comma --ask" "$out/bin/comma --ask"

     

       53
       +
         ''

     

       54
       +
         + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ''

     

       55
       +
           ${stdenv.hostPlatform.emulator buildPackages} "$out/bin/comma" --mangen > comma.1

     

       56
        
           installManPage comma.1

     

       57
        
         '';

     

       58

+3 -3

pkgs/by-name/ge/gemini-cli/package.nix

···

       7
        
       

     

       8
        
       buildNpmPackage (finalAttrs: {

     

       9
        
         pname = "gemini-cli";

     

       10
       -
         version = "0.1.22";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "google-gemini";

     

       14
        
           repo = "gemini-cli";

     

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

     

       16
       -
           hash = "sha256-taQyrthHrlHc6Zy8947bpxvbHeSq0+JbgxROtQOGq44=";

     

       17
        
         };

     

       18
        
       

     

       19
        
         patches = [

     
···

       21
        
           ./restore-missing-dependencies-fields.patch

     

       22
        
         ];

     

       23
        
       

     

       24
       -
         npmDepsHash = "sha256-1AJ+EZfPKioeptms3uio4U20zeQ9+yKC69Gbm6HlFMY=";

     

       25
        
       

     

       26
        
         preConfigure = ''

     

       27
        
           mkdir -p packages/generated

···

       7
        
       

     

       8
        
       buildNpmPackage (finalAttrs: {

     

       9
        
         pname = "gemini-cli";

     

       10
       +
         version = "0.2.1";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "google-gemini";

     

       14
        
           repo = "gemini-cli";

     

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

     

       16
       +
           hash = "sha256-TcXCGI27qJOVbR8XaJzE9dYV/3uDM9HATU1OkziRib8=";

     

       17
        
         };

     

       18
        
       

     

       19
        
         patches = [

     
···

       21
        
           ./restore-missing-dependencies-fields.patch

     

       22
        
         ];

     

       23
        
       

     

       24
       +
         npmDepsHash = "sha256-0j6kXlnWg7N23cnmMialZVqyZTAzgPn0VGAqSeYIVZM=";

     

       25
        
       

     

       26
        
         preConfigure = ''

     

       27
        
           mkdir -p packages/generated

+3 -3

pkgs/by-name/go/golds/package.nix

···

       8
        
       

     

       9
        
       buildGoModule rec {

     

       10
        
         pname = "golds";

     

       11
       -
         version = "0.7.6";

     

       12
        
       

     

       13
        
         src = fetchFromGitHub {

     

       14
        
           owner = "go101";

     

       15
        
           repo = "golds";

     

       16
        
           tag = "v${version}";

     

       17
       -
           hash = "sha256-j6k68+hiXsXW5WLnmbN/iFLFpyU64z/1+DKuaAnNbac=";

     

       18
        
         };

     

       19
        
       

     

       20
        
         # nixpkgs is not using the go distpack archive and missing a VERSION file in the source

     
···

       22
        
         # https://github.com/NixOS/nixpkgs/pull/358316#discussion_r1855322027

     

       23
        
         patches = [ ./info_module-gover.patch ];

     

       24
        
       

     

       25
       -
         vendorHash = "sha256-Sy9O23iCW8voImPFQkqczPxqGyD5rf0/tKxaRDFgbSs=";

     

       26
        
       

     

       27
        
         ldflags = [ "-s" ];

     

       28

···

       8
        
       

     

       9
        
       buildGoModule rec {

     

       10
        
         pname = "golds";

     

       11
       +
         version = "0.7.8";

     

       12
        
       

     

       13
        
         src = fetchFromGitHub {

     

       14
        
           owner = "go101";

     

       15
        
           repo = "golds";

     

       16
        
           tag = "v${version}";

     

       17
       +
           hash = "sha256-sK7mnvIy8xgsb/K73bEsp1x667AXrDJXSXjFbOSoX9A=";

     

       18
        
         };

     

       19
        
       

     

       20
        
         # nixpkgs is not using the go distpack archive and missing a VERSION file in the source

     
···

       22
        
         # https://github.com/NixOS/nixpkgs/pull/358316#discussion_r1855322027

     

       23
        
         patches = [ ./info_module-gover.patch ];

     

       24
        
       

     

       25
       +
         vendorHash = "sha256-CL9CdLGeMTxXazJUr2+syQYJZXafX6ARzmEOHn7l14I=";

     

       26
        
       

     

       27
        
         ldflags = [ "-s" ];

     

       28

+2 -2

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

···

       17
        
       

     

       18
        
       stdenv.mkDerivation (finalAttrs: {

     

       19
        
         pname = "jazz2";

     

       20
       -
         version = "3.3.0";

     

       21
        
       

     

       22
        
         src = fetchFromGitHub {

     

       23
        
           owner = "deathkiller";

     

       24
        
           repo = "jazz2-native";

     

       25
        
           tag = finalAttrs.version;

     

       26
       -
           hash = "sha256-dj+BEAx626vSPy26+Ip3uaj3SBE1SWkfbh5P8U0iXsg=";

     

       27
        
         };

     

       28
        
       

     

       29
        
         patches = [ ./nocontent.patch ];

···

       17
        
       

     

       18
        
       stdenv.mkDerivation (finalAttrs: {

     

       19
        
         pname = "jazz2";

     

       20
       +
         version = "3.4.0";

     

       21
        
       

     

       22
        
         src = fetchFromGitHub {

     

       23
        
           owner = "deathkiller";

     

       24
        
           repo = "jazz2-native";

     

       25
        
           tag = finalAttrs.version;

     

       26
       +
           hash = "sha256-96NiBE0/sBnIdajKui3pZmR8IGlElbeoyqYEYFWtOuM=";

     

       27
        
         };

     

       28
        
       

     

       29
        
         patches = [ ./nocontent.patch ];

+2 -2

pkgs/by-name/le/ledger-live-desktop/package.nix

···

       8
        
       

     

       9
        
       let

     

       10
        
         pname = "ledger-live-desktop";

     

       11
       -
         version = "2.124.0";

     

       12
        
       

     

       13
        
         src = fetchurl {

     

       14
        
           url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";

     

       15
       -
           hash = "sha256-aB9WFfGSdrIaBpOL7qqomfCqYIIsTeCch2fkta4M9RM=";

     

       16
        
         };

     

       17
        
       

     

       18
        
         appimageContents = appimageTools.extractType2 {

···

       8
        
       

     

       9
        
       let

     

       10
        
         pname = "ledger-live-desktop";

     

       11
       +
         version = "2.126.0";

     

       12
        
       

     

       13
        
         src = fetchurl {

     

       14
        
           url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";

     

       15
       +
           hash = "sha256-QAe8ft06Nna2rFyFTGK4mwfO1ueZKFcuacvKU4lln0k=";

     

       16
        
         };

     

       17
        
       

     

       18
        
         appimageContents = appimageTools.extractType2 {

+3 -3

pkgs/by-name/me/memray/package.nix

···

       10
        
       

     

       11
        
       python3Packages.buildPythonApplication rec {

     

       12
        
         pname = "memray";

     

       13
       -
         version = "1.17.2";

     

       14
        
         pyproject = true;

     

       15
        
       

     

       16
        
         src = fetchFromGitHub {

     

       17
        
           owner = "bloomberg";

     

       18
        
           repo = "memray";

     

       19
        
           tag = "v${version}";

     

       20
       -
           hash = "sha256-n000m2jIJJFZFTjfECS3gFrO6xHauZW46xe1tDqI6Lg=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         build-system = with python3Packages; [

     
···

       77
        
         meta = {

     

       78
        
           description = "Memory profiler for Python";

     

       79
        
           homepage = "https://bloomberg.github.io/memray/";

     

       80
       -
           changelog = "https://github.com/bloomberg/memray/releases/tag/v${src.tag}";

     

       81
        
           license = lib.licenses.asl20;

     

       82
        
           maintainers = with lib.maintainers; [ fab ];

     

       83
        
           platforms = lib.platforms.linux;

···

       10
        
       

     

       11
        
       python3Packages.buildPythonApplication rec {

     

       12
        
         pname = "memray";

     

       13
       +
         version = "1.18.0";

     

       14
        
         pyproject = true;

     

       15
        
       

     

       16
        
         src = fetchFromGitHub {

     

       17
        
           owner = "bloomberg";

     

       18
        
           repo = "memray";

     

       19
        
           tag = "v${version}";

     

       20
       +
           hash = "sha256-bShFMuDJlvBA3rQJRwXlsgRk4q+gdFQjOpDzOrp4/8k=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         build-system = with python3Packages; [

     
···

       77
        
         meta = {

     

       78
        
           description = "Memory profiler for Python";

     

       79
        
           homepage = "https://bloomberg.github.io/memray/";

     

       80
       +
           changelog = "https://github.com/bloomberg/memray/releases/tag/${src.tag}";

     

       81
        
           license = lib.licenses.asl20;

     

       82
        
           maintainers = with lib.maintainers; [ fab ];

     

       83
        
           platforms = lib.platforms.linux;

+2 -2

pkgs/by-name/mo/monero-cli/package.nix

···

       40
        
       in

     

       41
        
       stdenv.mkDerivation rec {

     

       42
        
         pname = "monero-cli";

     

       43
       -
         version = "0.18.4.1";

     

       44
        
       

     

       45
        
         src = fetchFromGitHub {

     

       46
        
           owner = "monero-project";

     

       47
        
           repo = "monero";

     

       48
        
           rev = "v${version}";

     

       49
       -
           hash = "sha256-z5yhU1xePFBSmfl0X8x7AAgPvqUX0PQzLzxMblS8Um8=";

     

       50
        
         };

     

       51
        
       

     

       52
        
         patches = [

···

       40
        
       in

     

       41
        
       stdenv.mkDerivation rec {

     

       42
        
         pname = "monero-cli";

     

       43
       +
         version = "0.18.4.2";

     

       44
        
       

     

       45
        
         src = fetchFromGitHub {

     

       46
        
           owner = "monero-project";

     

       47
        
           repo = "monero";

     

       48
        
           rev = "v${version}";

     

       49
       +
           hash = "sha256-ibwcvEHlJkMjXoJQMPVrlir5irdclJsmV7aBB4/m190=";

     

       50
        
         };

     

       51
        
       

     

       52
        
         patches = [

+2 -2

pkgs/by-name/mo/monero-gui/package.nix

···

       28
        
       

     

       29
        
       stdenv.mkDerivation rec {

     

       30
        
         pname = "monero-gui";

     

       31
       -
         version = "0.18.4.1";

     

       32
        
       

     

       33
        
         src = fetchFromGitHub {

     

       34
        
           owner = "monero-project";

     

       35
        
           repo = "monero-gui";

     

       36
        
           rev = "v${version}";

     

       37
       -
           hash = "sha256-Fm/kV31aKcjQjMO8vwjfDQsH8Qq8pRdFX3zbZdEGETg=";

     

       38
        
         };

     

       39
        
       

     

       40
        
         nativeBuildInputs = [

···

       28
        
       

     

       29
        
       stdenv.mkDerivation rec {

     

       30
        
         pname = "monero-gui";

     

       31
       +
         version = "0.18.4.2";

     

       32
        
       

     

       33
        
         src = fetchFromGitHub {

     

       34
        
           owner = "monero-project";

     

       35
        
           repo = "monero-gui";

     

       36
        
           rev = "v${version}";

     

       37
       +
           hash = "sha256-FKQrB47q791lDaomI5A10qw1oGh5zp9TFPpFoX2ZAmc=";

     

       38
        
         };

     

       39
        
       

     

       40
        
         nativeBuildInputs = [

+1

pkgs/by-name/pa/paperless-ngx/package.nix

···

       169
        
       

     

       170
        
         pythonRelaxDeps = [

     

       171
        
           "django-allauth"

     

       0
        
       
     

       172
        
           "redis"

     

       173
        
         ];

     

       174

···

       169
        
       

     

       170
        
         pythonRelaxDeps = [

     

       171
        
           "django-allauth"

     

       172
       +
           "rapidfuzz"

     

       173
        
           "redis"

     

       174
        
         ];

     

       175

+2 -2

pkgs/by-name/ra/radicle-node/update.sh

···

       1
        
       #!/usr/bin/env nix-shell

     

       2
       -
       #!nix-shell -i bash -p coreutils gnused common-updater-scripts nix-update

     

       3
        
       

     

       4
       -
       version=$(list-git-tags | tail -1 | sed 's|^releases/||')

     

       5
        
       nix-update --version="$version" radicle-node

···

       1
        
       #!/usr/bin/env nix-shell

     

       2
       +
       #!nix-shell -i bash -p coreutils gnugrep common-updater-scripts nix-update

     

       3
        
       

     

       4
       +
       version=$(list-git-tags | grep -oP '^releases/\K\d+\.\d+\.\d+$' | sort -rV | head -1)

     

       5
        
       nix-update --version="$version" radicle-node

+7

pkgs/by-name/sc/scrounge-ntfs/package.nix

···

       13
        
           hash = "sha256-HYrMIMTRPmgAac/vaZ1jaUFchyAl5B0quxgHH0DHJ84=";

     

       14
        
         };

     

       15
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       16
        
         patches = [

     

       17
        
           ./darwin.diff

     

       18
        
         ];

···

       13
        
           hash = "sha256-HYrMIMTRPmgAac/vaZ1jaUFchyAl5B0quxgHH0DHJ84=";

     

       14
        
         };

     

       15
        
       

     

       16
       +
         env.NIX_CFLAGS_COMPILE = "-D_FILE_OFFSET_BITS=64";

     

       17
       +
       

     

       18
       +
         postPatch = ''

     

       19
       +
           substituteInPlace src/{list,ntfsx,scrounge}.c \

     

       20
       +
             --replace-fail "lseek64" "lseek"

     

       21
       +
         '';

     

       22
       +
       

     

       23
        
         patches = [

     

       24
        
           ./darwin.diff

     

       25
        
         ];

+3 -3

pkgs/by-name/so/soft-serve/package.nix

···

       10
        
       

     

       11
        
       buildGoModule rec {

     

       12
        
         pname = "soft-serve";

     

       13
       -
         version = "0.9.1";

     

       14
        
       

     

       15
        
         src = fetchFromGitHub {

     

       16
        
           owner = "charmbracelet";

     

       17
        
           repo = "soft-serve";

     

       18
        
           rev = "v${version}";

     

       19
       -
           hash = "sha256-gjkq1Be+x5qZYjO3pWt+u5A2izgMfR3+nxIHTc1ck6Y=";

     

       20
        
         };

     

       21
        
       

     

       22
       -
         vendorHash = "sha256-l0gsStKkfH0TQ1a935LSuFah3BBwVsMD4iSf2oDyViY=";

     

       23
        
       

     

       24
        
         doCheck = false;

     

       25

···

       10
        
       

     

       11
        
       buildGoModule rec {

     

       12
        
         pname = "soft-serve";

     

       13
       +
         version = "0.10.0";

     

       14
        
       

     

       15
        
         src = fetchFromGitHub {

     

       16
        
           owner = "charmbracelet";

     

       17
        
           repo = "soft-serve";

     

       18
        
           rev = "v${version}";

     

       19
       +
           hash = "sha256-Lg7cESGMbVCNx0KQBIAP/UsfvO3IO+DO9bYiQbg9Fls=";

     

       20
        
         };

     

       21
        
       

     

       22
       +
         vendorHash = "sha256-DBgVcbt2kejtEJSajJh6vS4feT3Lwm+KqUOks55iWIc=";

     

       23
        
       

     

       24
        
         doCheck = false;

     

       25

+4 -4

pkgs/by-name/ti/tideways-daemon/package.nix

···

       10
        
       

     

       11
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       12
        
         pname = "tideways-daemon";

     

       13
       -
         version = "1.9.48";

     

       14
        
       

     

       15
        
         src =

     

       16
        
           finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}

     
···

       28
        
           sources = {

     

       29
        
             "x86_64-linux" = fetchurl {

     

       30
        
               url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz";

     

       31
       -
               hash = "sha256-5o39BwSKltqkbbcbArbKXmU3HQdXwC7QD3sq+3OK3yI=";

     

       32
        
             };

     

       33
        
             "aarch64-linux" = fetchurl {

     

       34
        
               url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz";

     

       35
       -
               hash = "sha256-akhRnWAzisjxOb4j3HCSGZ1e/qJcHERR2Msd1hB1on4=";

     

       36
        
             };

     

       37
        
             "aarch64-darwin" = fetchurl {

     

       38
        
               url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz";

     

       39
       -
               hash = "sha256-7Ss+TQPkMyV18LU2EA7KZZjtb2S6hzEbwkIzAemee5E=";

     

       40
        
             };

     

       41
        
           };

     

       42
        
           updateScript = "${

···

       10
        
       

     

       11
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       12
        
         pname = "tideways-daemon";

     

       13
       +
         version = "1.9.52";

     

       14
        
       

     

       15
        
         src =

     

       16
        
           finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}

     
···

       28
        
           sources = {

     

       29
        
             "x86_64-linux" = fetchurl {

     

       30
        
               url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz";

     

       31
       +
               hash = "sha256-8OGGF1b74lYv1EQgcY54gdwJ2mvuS2D2oNdmKoJmkmM=";

     

       32
        
             };

     

       33
        
             "aarch64-linux" = fetchurl {

     

       34
        
               url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz";

     

       35
       +
               hash = "sha256-adtA5+Ft7ToTDeQ2vp3Hx1UUHgU0NUlcCVpJsV1alvU=";

     

       36
        
             };

     

       37
        
             "aarch64-darwin" = fetchurl {

     

       38
        
               url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz";

     

       39
       +
               hash = "sha256-kMIvW3dabv9iHLOx9QbsuiBkts62FHjvEYzBze9prlw=";

     

       40
        
             };

     

       41
        
           };

     

       42
        
           updateScript = "${

+5

pkgs/development/libraries/gstreamer/rs/default.nix

···

       178
        
         patches = [

     

       179
        
           # Related to https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/723

     

       180
        
           ./ignore-tests.patch

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       181
        
         ];

     

       182
        
       

     

       183
        
         strictDeps = true;

···

       178
        
         patches = [

     

       179
        
           # Related to https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/723

     

       180
        
           ./ignore-tests.patch

     

       181
       +
           (fetchpatch {

     

       182
       +
             name = "x264enc-test-fix.patch";

     

       183
       +
             url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/commit/c0c9888d66e107f9e0b6d96cd3a85961c7e97d9a.diff";

     

       184
       +
             hash = "sha256-/ILdPDjI20k5l9Qf/klglSuhawmFUs9mR+VhBnQqsWw=";

     

       185
       +
           })

     

       186
        
         ];

     

       187
        
       

     

       188
        
         strictDeps = true;

-20

pkgs/development/libraries/gstreamer/rs/ignore-tests.patch

···

       1
       -
       diff --git a/mux/mp4/tests/tests.rs b/mux/mp4/tests/tests.rs

     

       2
       -
       index 52b91f59..c5875554 100644

     

       3
       -
       --- a/mux/mp4/tests/tests.rs

     

       4
       -
       +++ b/mux/mp4/tests/tests.rs

     

       5
       -
       @@ -1339,6 +1339,7 @@ fn test_taic_encode_cannot_sync(video_enc: &str) {

     

       6
       -
            );

     

       7
       -
        }

     

       8
       -
        

     

       9
       -
       +#[ignore = "Unknown failure"]

     

       10
       -
        #[test]

     

       11
       -
        fn test_taic_x264() {

     

       12
       -
            init();

     

       13
       -
       @@ -1359,6 +1360,7 @@ fn test_taic_stai_x264_not_enabled() {

     

       14
       -
            test_taic_stai_encode("x264enc", false);

     

       15
       -
        }

     

       16
       -
        

     

       17
       -
       +#[ignore = "Unknown failure"]

     

       18
       -
        #[test]

     

       19
       -
        fn test_taic_x264_no_sync() {

     

       20
       -
            init();

     

       21
        
       diff --git a/utils/uriplaylistbin/tests/uriplaylistbin.rs b/utils/uriplaylistbin/tests/uriplaylistbin.rs

     

       22
        
       index 3489eaa8..569635d6 100644

     

       23
        
       --- a/utils/uriplaylistbin/tests/uriplaylistbin.rs

···

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1
        
       diff --git a/utils/uriplaylistbin/tests/uriplaylistbin.rs b/utils/uriplaylistbin/tests/uriplaylistbin.rs

     

       2
        
       index 3489eaa8..569635d6 100644

     

       3
        
       --- a/utils/uriplaylistbin/tests/uriplaylistbin.rs

+2 -2

pkgs/development/python-modules/adafruit-platformdetect/default.nix

···

       7
        
       

     

       8
        
       buildPythonPackage rec {

     

       9
        
         pname = "adafruit-platformdetect";

     

       10
       -
         version = "3.82.0";

     

       11
        
         pyproject = true;

     

       12
        
       

     

       13
        
         src = fetchPypi {

     

       14
        
           pname = "adafruit_platformdetect";

     

       15
        
           inherit version;

     

       16
       -
           hash = "sha256-C/ese6ezyDFp+3ifobq/DlHsz4g0wrBnuWCoa69qYYg=";

     

       17
        
         };

     

       18
        
       

     

       19
        
         build-system = [ setuptools-scm ];

···

       7
        
       

     

       8
        
       buildPythonPackage rec {

     

       9
        
         pname = "adafruit-platformdetect";

     

       10
       +
         version = "3.83.0";

     

       11
        
         pyproject = true;

     

       12
        
       

     

       13
        
         src = fetchPypi {

     

       14
        
           pname = "adafruit_platformdetect";

     

       15
        
           inherit version;

     

       16
       +
           hash = "sha256-woiuT3RnxDkLtDaBAh9vdUvsMKAp3s5ahpJNS1T2DcQ=";

     

       17
        
         };

     

       18
        
       

     

       19
        
         build-system = [ setuptools-scm ];

+1 -1

pkgs/development/python-modules/duckduckgo-search/default.nix

···

       30
        
       

     

       31
        
         doCheck = false; # tests require network access

     

       32
        
       

     

       33
       -
         pythonImportsCheck = [ "duckduckgo_search" ];

     

       34
        
       

     

       35
        
         meta = {

     

       36
        
           description = "Python CLI and library for searching for words, documents, images, videos, news, maps and text translation using the DuckDuckGo.com search engine";

···

       30
        
       

     

       31
        
         doCheck = false; # tests require network access

     

       32
        
       

     

       33
       +
         pythonImportsCheck = [ "ddgs" ];

     

       34
        
       

     

       35
        
         meta = {

     

       36
        
           description = "Python CLI and library for searching for words, documents, images, videos, news, maps and text translation using the DuckDuckGo.com search engine";

+2 -2

pkgs/development/python-modules/fastapi-mcp/default.nix

···

       20
        
       

     

       21
        
         # tests

     

       22
        
         coverage,

     

       23
       -
         pytest-asyncio,

     

       24
        
         pytest-cov-stub,

     

       25
        
         pytestCheckHook,

     

       26
        
       }:

     
···

       59
        
       

     

       60
        
         nativeCheckInputs = [

     

       61
        
           coverage

     

       62
       -
           pytest-asyncio

     

       63
        
           pytest-cov-stub

     

       64
        
           pytestCheckHook

     

       65
        
         ];

···

       20
        
       

     

       21
        
         # tests

     

       22
        
         coverage,

     

       23
       +
         pytest-asyncio_0,

     

       24
        
         pytest-cov-stub,

     

       25
        
         pytestCheckHook,

     

       26
        
       }:

     
···

       59
        
       

     

       60
        
         nativeCheckInputs = [

     

       61
        
           coverage

     

       62
       +
           pytest-asyncio_0

     

       63
        
           pytest-cov-stub

     

       64
        
           pytestCheckHook

     

       65
        
         ];

+2 -2

pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix

···

       10
        
       

     

       11
        
       buildPythonPackage rec {

     

       12
        
         pname = "llama-index-vector-stores-chroma";

     

       13
       -
         version = "0.5.0";

     

       14
        
         pyproject = true;

     

       15
        
       

     

       16
        
         disabled = pythonOlder "3.8";

     
···

       18
        
         src = fetchPypi {

     

       19
        
           pname = "llama_index_vector_stores_chroma";

     

       20
        
           inherit version;

     

       21
       -
           hash = "sha256-5gkwYvmBXeRxGBL1CoM5H/obYDTceap1TP00uv8SDs4=";

     

       22
        
         };

     

       23
        
       

     

       24
        
         build-system = [ hatchling ];

···

       10
        
       

     

       11
        
       buildPythonPackage rec {

     

       12
        
         pname = "llama-index-vector-stores-chroma";

     

       13
       +
         version = "0.5.2";

     

       14
        
         pyproject = true;

     

       15
        
       

     

       16
        
         disabled = pythonOlder "3.8";

     
···

       18
        
         src = fetchPypi {

     

       19
        
           pname = "llama_index_vector_stores_chroma";

     

       20
        
           inherit version;

     

       21
       +
           hash = "sha256-2NX72ejiuzhjCi15EPa9OJZtTkKb5ySjMRfiDP617lY=";

     

       22
        
         };

     

       23
        
       

     

       24
        
         build-system = [ hatchling ];

+5 -8

pkgs/development/python-modules/pandas-stubs/default.nix

···

       2
        
         lib,

     

       3
        
         stdenv,

     

       4
        
         buildPythonPackage,

     

       5
       -
         pythonOlder,

     

       6
        
         fetchFromGitHub,

     

       7
        
       

     

       8
        
         # build-system

     
···

       36
        
       

     

       37
        
       buildPythonPackage rec {

     

       38
        
         pname = "pandas-stubs";

     

       39
       -
         version = "2.2.3.250308";

     

       40
        
         pyproject = true;

     

       41
       -
       

     

       42
       -
         disabled = pythonOlder "3.10";

     

       43
        
       

     

       44
        
         src = fetchFromGitHub {

     

       45
        
           owner = "pandas-dev";

     

       46
        
           repo = "pandas-stubs";

     

       47
        
           tag = "v${version}";

     

       48
       -
           hash = "sha256-93XVzdb3A2S+Exk33v3U8HDMg9vPKAEkWjLZnBaXMWQ=";

     

       49
        
         };

     

       50
        
       

     

       51
        
         build-system = [ poetry-core ];

     
···

       99
        
       

     

       100
        
         pythonImportsCheck = [ "pandas" ];

     

       101
        
       

     

       102
       -
         meta = with lib; {

     

       103
        
           description = "Type annotations for Pandas";

     

       104
        
           homepage = "https://github.com/pandas-dev/pandas-stubs";

     

       105
       -
           license = licenses.mit;

     

       106
       -
           maintainers = with maintainers; [ malo ];

     

       107
        
         };

     

       108
        
       }

···

       2
        
         lib,

     

       3
        
         stdenv,

     

       4
        
         buildPythonPackage,

     

       0
        
       
     

       5
        
         fetchFromGitHub,

     

       6
        
       

     

       7
        
         # build-system

     
···

       35
        
       

     

       36
        
       buildPythonPackage rec {

     

       37
        
         pname = "pandas-stubs";

     

       38
       +
         version = "2.3.2.250827";

     

       39
        
         pyproject = true;

     

       0
        
       
     

       0
        
       
     

       40
        
       

     

       41
        
         src = fetchFromGitHub {

     

       42
        
           owner = "pandas-dev";

     

       43
        
           repo = "pandas-stubs";

     

       44
        
           tag = "v${version}";

     

       45
       +
           hash = "sha256-qjHnFT/ydK5n6QfUzAhnGJWVpqHQbMoqGkel3Pu7S78=";

     

       46
        
         };

     

       47
        
       

     

       48
        
         build-system = [ poetry-core ];

     
···

       96
        
       

     

       97
        
         pythonImportsCheck = [ "pandas" ];

     

       98
        
       

     

       99
       +
         meta = {

     

       100
        
           description = "Type annotations for Pandas";

     

       101
        
           homepage = "https://github.com/pandas-dev/pandas-stubs";

     

       102
       +
           license = lib.licenses.mit;

     

       103
       +
           maintainers = with lib.maintainers; [ malo ];

     

       104
        
         };

     

       105
        
       }

+10 -4

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

···

       4
        
         fetchFromGitHub,

     

       5
        
         capstone,

     

       6
        
         filebytes,

     

       0
        
       
     

       7
        
         pytestCheckHook,

     

       8
        
         pythonOlder,

     

       9
        
         setuptools,

     
···

       11
        
       

     

       12
        
       buildPythonPackage rec {

     

       13
        
         pname = "ropper";

     

       14
       -
         version = "1.13.10";

     

       15
        
         pyproject = true;

     

       16
        
       

     

       17
        
         disabled = pythonOlder "3.7";

     
···

       19
        
         src = fetchFromGitHub {

     

       20
        
           owner = "sashs";

     

       21
        
           repo = "Ropper";

     

       22
       -
           rev = "v${version}";

     

       23
       -
           hash = "sha256-yuHJ+EpglumEAXEu0iJKIXK1ouW1yptNahM9Wmk7AW4=";

     

       24
        
         };

     

       25
        
       

     

       26
        
         build-system = [ setuptools ];

     
···

       30
        
           filebytes

     

       31
        
         ];

     

       32
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       33
        
         nativeCheckInputs = [ pytestCheckHook ];

     

       34
        
       

     

       35
        
         pythonImportsCheck = [ "ropper" ];

     

       36
        
       

     

       37
        
         meta = with lib; {

     

       38
        
           description = "Show information about files in different file formats";

     

       39
       -
           mainProgram = "ropper";

     

       40
        
           homepage = "https://scoding.de/ropper/";

     

       0
        
       
     

       41
        
           license = licenses.bsd3;

     

       42
        
           maintainers = with maintainers; [ bennofs ];

     

       0
        
       
     

       43
        
         };

     

       44
        
       }

···

       4
        
         fetchFromGitHub,

     

       5
        
         capstone,

     

       6
        
         filebytes,

     

       7
       +
         keystone-engine,

     

       8
        
         pytestCheckHook,

     

       9
        
         pythonOlder,

     

       10
        
         setuptools,

     
···

       12
        
       

     

       13
        
       buildPythonPackage rec {

     

       14
        
         pname = "ropper";

     

       15
       +
         version = "1.13.13";

     

       16
        
         pyproject = true;

     

       17
        
       

     

       18
        
         disabled = pythonOlder "3.7";

     
···

       20
        
         src = fetchFromGitHub {

     

       21
        
           owner = "sashs";

     

       22
        
           repo = "Ropper";

     

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

     

       24
       +
           hash = "sha256-MOAbACLDdeKCMV4K/n1rAQlxDN0JoDIiUF6Zr3yPw8o=";

     

       25
        
         };

     

       26
        
       

     

       27
        
         build-system = [ setuptools ];

     
···

       31
        
           filebytes

     

       32
        
         ];

     

       33
        
       

     

       34
       +
         optional-dependencies = {

     

       35
       +
           ropchain = [ keystone-engine ];

     

       36
       +
         };

     

       37
       +
       

     

       38
        
         nativeCheckInputs = [ pytestCheckHook ];

     

       39
        
       

     

       40
        
         pythonImportsCheck = [ "ropper" ];

     

       41
        
       

     

       42
        
         meta = with lib; {

     

       43
        
           description = "Show information about files in different file formats";

     

       0
        
       
     

       44
        
           homepage = "https://scoding.de/ropper/";

     

       45
       +
           changelog = "https://github.com/sashs/Ropper/releases/tag/${src.tag}";

     

       46
        
           license = licenses.bsd3;

     

       47
        
           maintainers = with maintainers; [ bennofs ];

     

       48
       +
           mainProgram = "ropper";

     

       49
        
         };

     

       50
        
       }

+26 -10

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

···

       1
        
       {

     

       2
        
         lib,

     

       0
        
       
     

       3
        
         buildPythonPackage,

     

       4
        
         fetchFromGitHub,

     

       5
       -
         pythonOlder,

     

       6
        
         hatchling,

     

       7
       -
         pytestCheckHook,

     

       8
       -
         pytest-cov-stub,

     

       9
        
         huggingface-hub,

     

       10
        
         matplotlib,

     

       0
        
       
     

       0
        
       
     

       11
        
         pandas,

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       12
        
         scikit-learn,

     

       13
       -
         stdenv,

     

       14
        
         streamlit,

     

       15
        
         tabulate,

     

       16
        
       }:

     
···

       30
        
         build-system = [ hatchling ];

     

       31
        
       

     

       32
        
         dependencies = [

     

       33
       -
           huggingface-hub

     

       0
        
       
     

       0
        
       
     

       34
        
           scikit-learn

     

       35
        
           tabulate

     

       36
        
         ];

     
···

       38
        
         nativeCheckInputs = [

     

       39
        
           matplotlib

     

       40
        
           pandas

     

       41
       -
           pytestCheckHook

     

       42
        
           pytest-cov-stub

     

       0
        
       
     

       0
        
       
     

       43
        
           streamlit

     

       44
        
         ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       45
        
         enabledTestPaths = [ "skops" ];

     

       0
        
       
     

       46
        
         disabledTests = [

     

       47
        
           # flaky

     

       48
        
           "test_base_case_works_as_expected"

     

       0
        
       
     

       0
        
       
     

       49
        
         ];

     

       0
        
       
     

       50
        
         disabledTestPaths = [

     

       51
       -
           # try to download data from Huggingface Hub:

     

       52
       -
           "skops/hub_utils/tests"

     

       53
       -
           "skops/card/tests"

     

       54
        
           # minor output formatting issue

     

       55
        
           "skops/card/_model_card.py"

     

       56
        
         ]

     
···

       58
        
           # Segfaults on darwin

     

       59
        
           "skops/io/tests/test_persist.py"

     

       60
        
         ];

     

       0
        
       
     

       61
        
         pytestFlags = [

     

       62
        
           # Warning from scipy.optimize in skops/io/tests/test_persist.py::test_dump_and_load_with_file_wrapper

     

       63
        
           # https://github.com/skops-dev/skops/issues/479

     

       64
        
           "-Wignore::DeprecationWarning"

     

       65
        
         ];

     

       0
        
       
     

       66
        
         pythonImportsCheck = [ "skops" ];

     

       67
        
       

     

       68
        
         meta = {

     

       69
        
           description = "Library for saving/loading, sharing, and deploying scikit-learn based models";

     

       70
       -
           mainProgram = "skops";

     

       71
        
           homepage = "https://skops.readthedocs.io/en/stable";

     

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

     

       73
        
           license = lib.licenses.mit;

     

       74
        
           maintainers = [ lib.maintainers.bcdarwin ];

     

       0
        
       
     

       75
        
         };

     

       76
        
       }

···

       1
        
       {

     

       2
        
         lib,

     

       3
       +
         stdenv,

     

       4
        
         buildPythonPackage,

     

       5
        
         fetchFromGitHub,

     

       0
        
       
     

       6
        
         hatchling,

     

       0
        
       
     

       0
        
       
     

       7
        
         huggingface-hub,

     

       8
        
         matplotlib,

     

       9
       +
         numpy,

     

       10
       +
         packaging,

     

       11
        
         pandas,

     

       12
       +
         prettytable,

     

       13
       +
         pytest-cov-stub,

     

       14
       +
         pytestCheckHook,

     

       15
       +
         pythonOlder,

     

       16
       +
         pyyaml,

     

       17
       +
         rich,

     

       18
        
         scikit-learn,

     

       0
        
       
     

       19
        
         streamlit,

     

       20
        
         tabulate,

     

       21
        
       }:

     
···

       35
        
         build-system = [ hatchling ];

     

       36
        
       

     

       37
        
         dependencies = [

     

       38
       +
           numpy

     

       39
       +
           packaging

     

       40
       +
           prettytable

     

       41
        
           scikit-learn

     

       42
        
           tabulate

     

       43
        
         ];

     
···

       45
        
         nativeCheckInputs = [

     

       46
        
           matplotlib

     

       47
        
           pandas

     

       0
        
       
     

       48
        
           pytest-cov-stub

     

       49
       +
           pytestCheckHook

     

       50
       +
           pyyaml

     

       51
        
           streamlit

     

       52
        
         ];

     

       53
       +
       

     

       54
       +
         optional-dependencies = {

     

       55
       +
           rich = [ rich ];

     

       56
       +
         };

     

       57
       +
       

     

       58
        
         enabledTestPaths = [ "skops" ];

     

       59
       +
       

     

       60
        
         disabledTests = [

     

       61
        
           # flaky

     

       62
        
           "test_base_case_works_as_expected"

     

       63
       +
           # fairlearn is not available in nixpkgs

     

       64
       +
           "TestAddFairlearnMetricFrame"

     

       65
        
         ];

     

       66
       +
       

     

       67
        
         disabledTestPaths = [

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       68
        
           # minor output formatting issue

     

       69
        
           "skops/card/_model_card.py"

     

       70
        
         ]

     
···

       72
        
           # Segfaults on darwin

     

       73
        
           "skops/io/tests/test_persist.py"

     

       74
        
         ];

     

       75
       +
       

     

       76
        
         pytestFlags = [

     

       77
        
           # Warning from scipy.optimize in skops/io/tests/test_persist.py::test_dump_and_load_with_file_wrapper

     

       78
        
           # https://github.com/skops-dev/skops/issues/479

     

       79
        
           "-Wignore::DeprecationWarning"

     

       80
        
         ];

     

       81
       +
       

     

       82
        
         pythonImportsCheck = [ "skops" ];

     

       83
        
       

     

       84
        
         meta = {

     

       85
        
           description = "Library for saving/loading, sharing, and deploying scikit-learn based models";

     

       0
        
       
     

       86
        
           homepage = "https://skops.readthedocs.io/en/stable";

     

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

     

       88
        
           license = lib.licenses.mit;

     

       89
        
           maintainers = [ lib.maintainers.bcdarwin ];

     

       90
       +
           mainProgram = "skops";

     

       91
        
         };

     

       92
        
       }

+4 -4

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

···

       33
        
         # openai

     

       34
        
         openai,

     

       35
        
         # toolkit

     

       36
       -
         duckduckgo-search,

     

       37
        
         markdownify,

     

       38
        
         # torch

     

       39
        
         numpy,

     
···

       52
        
       

     

       53
        
       buildPythonPackage rec {

     

       54
        
         pname = "smolagents";

     

       55
       -
         version = "1.20.0";

     

       56
        
         pyproject = true;

     

       57
        
       

     

       58
        
         src = fetchFromGitHub {

     

       59
        
           owner = "huggingface";

     

       60
        
           repo = "smolagents";

     

       61
        
           tag = "v${version}";

     

       62
       -
           hash = "sha256-ING+C2MACKFto+1FON5OGFgzLf8SM99ViTdADzNzQLw=";

     

       63
        
         };

     

       64
        
       

     

       65
        
         # TODO: remove at the next release

     
···

       108
        
           #   opentelemetry-sdk

     

       109
        
           # ];

     

       110
        
           toolkit = [

     

       111
       -
             duckduckgo-search

     

       112
        
             markdownify

     

       113
        
           ];

     

       114
        
           torch = [

···

       33
        
         # openai

     

       34
        
         openai,

     

       35
        
         # toolkit

     

       36
       +
         ddgs,

     

       37
        
         markdownify,

     

       38
        
         # torch

     

       39
        
         numpy,

     
···

       52
        
       

     

       53
        
       buildPythonPackage rec {

     

       54
        
         pname = "smolagents";

     

       55
       +
         version = "1.21.2";

     

       56
        
         pyproject = true;

     

       57
        
       

     

       58
        
         src = fetchFromGitHub {

     

       59
        
           owner = "huggingface";

     

       60
        
           repo = "smolagents";

     

       61
        
           tag = "v${version}";

     

       62
       +
           hash = "sha256-sm0G8z5Jaes8XybxeAUiRh3LVuzvnGaem5FLkcA5Qls=";

     

       63
        
         };

     

       64
        
       

     

       65
        
         # TODO: remove at the next release

     
···

       108
        
           #   opentelemetry-sdk

     

       109
        
           # ];

     

       110
        
           toolkit = [

     

       111
       +
             ddgs

     

       112
        
             markdownify

     

       113
        
           ];

     

       114
        
           torch = [

+2 -2

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

···

       10
        
       

     

       11
        
       buildPythonPackage rec {

     

       12
        
         pname = "stripe";

     

       13
       -
         version = "12.4.0";

     

       14
        
         pyproject = true;

     

       15
        
       

     

       16
        
         disabled = pythonOlder "3.8";

     

       17
        
       

     

       18
        
         src = fetchPypi {

     

       19
        
           inherit pname version;

     

       20
       -
           hash = "sha256-HNH1sFeYZ5IwgbrPWUlZ0fQD8hgiOgbcOCc76wfQFWc=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         build-system = [ setuptools ];

···

       10
        
       

     

       11
        
       buildPythonPackage rec {

     

       12
        
         pname = "stripe";

     

       13
       +
         version = "12.5.0";

     

       14
        
         pyproject = true;

     

       15
        
       

     

       16
        
         disabled = pythonOlder "3.8";

     

       17
        
       

     

       18
        
         src = fetchPypi {

     

       19
        
           inherit pname version;

     

       20
       +
           hash = "sha256-zSuOcSFrau1dwem15vZYteIdaaYNRPuMCPQeH3vd7dA=";

     

       21
        
         };

     

       22
        
       

     

       23
        
         build-system = [ setuptools ];

+2 -2

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

···

       8
        
       

     

       9
        
       buildPythonPackage rec {

     

       10
        
         pname = "tlds";

     

       11
       -
         version = "2025051700";

     

       12
        
         pyproject = true;

     

       13
        
       

     

       14
        
         src = fetchFromGitHub {

     

       15
        
           owner = "kichik";

     

       16
        
           repo = "tlds";

     

       17
        
           tag = version;

     

       18
       -
           hash = "sha256-AqVe9U/gLjXkmLls4+t04youpY7DtrbmlaHVUdAElMo=";

     

       19
        
         };

     

       20
        
       

     

       21
        
         nativeBuildInputs = [ setuptools ];

···

       8
        
       

     

       9
        
       buildPythonPackage rec {

     

       10
        
         pname = "tlds";

     

       11
       +
         version = "2025082700";

     

       12
        
         pyproject = true;

     

       13
        
       

     

       14
        
         src = fetchFromGitHub {

     

       15
        
           owner = "kichik";

     

       16
        
           repo = "tlds";

     

       17
        
           tag = version;

     

       18
       +
           hash = "sha256-sMK+jglwhF8FX8yLDHBtheudfg20MOJhk+zHznQ0hbk=";

     

       19
        
         };

     

       20
        
       

     

       21
        
         nativeBuildInputs = [ setuptools ];

+2 -2

pkgs/os-specific/linux/kernel/zen-kernels.nix

···

       16
        
         variants = {

     

       17
        
           # ./update-zen.py zen

     

       18
        
           zen = {

     

       19
       -
             version = "6.16.1"; # zen

     

       20
        
             suffix = "zen1"; # zen

     

       21
       -
             sha256 = "1z20d53hz1zwg65x8jbq57v7snh9z5qk0gnvw4v6xfn9hwi79sjs"; # zen

     

       22
        
             isLqx = false;

     

       23
        
           };

     

       24
        
           # ./update-zen.py lqx

···

       16
        
         variants = {

     

       17
        
           # ./update-zen.py zen

     

       18
        
           zen = {

     

       19
       +
             version = "6.16.3"; # zen

     

       20
        
             suffix = "zen1"; # zen

     

       21
       +
             sha256 = "1dxxpd1j163m0ijw3ldc0v958jwn002crw5x0n1yzrklgs4jp4dm"; # zen

     

       22
        
             isLqx = false;

     

       23
        
           };

     

       24
        
           # ./update-zen.py lqx

-13

pkgs/os-specific/linux/scx/scx_cscheds.nix

···

       58
        
           cp ${finalAttrs.fetchLibbpf} meson-scripts/fetch_libbpf

     

       59
        
           substituteInPlace meson.build \

     

       60
        
             --replace-fail '[build_bpftool' "['${lib.getExe bash}', build_bpftool"

     

       61
       -
       

     

       62
       -
           # TODO: Remove in next release.

     

       63
       -
           substituteInPlace lib/scxtest/overrides.h \

     

       64
       -
             --replace-fail '#define __builtin_preserve_enum_value(x,y,z) 1' '#define __builtin_preserve_enum_value(x,y) 1'

     

       65
        
         '';

     

       66
        
       

     

       67
        
         nativeBuildInputs = [

     
···

       89
        
             "systemd" = false;

     

       90
        
             # not for nix

     

       91
        
             "openrc" = false;

     

       92
       -
             "libalpm" = false;

     

       93
        
           })

     

       94
        
           (lib.mapAttrsToList lib.mesonBool {

     

       95
        
             # needed libs are already fetched as FOD

     
···

       106
        
           "zerocallusedregs"

     

       107
        
         ];

     

       108
        
       

     

       109
       -
         # We copy the compiled header files to the dev output

     

       110
       -
         # These are needed for the rust schedulers

     

       111
       -
         postFixup = ''

     

       112
       -
           mkdir -p ${placeholder "dev"}

     

       113
       -
           cp -r libbpf ${placeholder "dev"}

     

       114
       -
         '';

     

       115
       -
       

     

       116
        
         outputs = [

     

       117
        
           "bin"

     

       118
       -
           "dev"

     

       119
        
           "out"

     

       120
        
         ];

     

       121

···

       58
        
           cp ${finalAttrs.fetchLibbpf} meson-scripts/fetch_libbpf

     

       59
        
           substituteInPlace meson.build \

     

       60
        
             --replace-fail '[build_bpftool' "['${lib.getExe bash}', build_bpftool"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       61
        
         '';

     

       62
        
       

     

       63
        
         nativeBuildInputs = [

     
···

       85
        
             "systemd" = false;

     

       86
        
             # not for nix

     

       87
        
             "openrc" = false;

     

       0
        
       
     

       88
        
           })

     

       89
        
           (lib.mapAttrsToList lib.mesonBool {

     

       90
        
             # needed libs are already fetched as FOD

     
···

       101
        
           "zerocallusedregs"

     

       102
        
         ];

     

       103
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       104
        
         outputs = [

     

       105
        
           "bin"

     

       0
        
       
     

       106
        
           "out"

     

       107
        
         ];

     

       108

+1 -13

pkgs/os-specific/linux/scx/scx_rustscheds.nix

···

       7
        
         zlib,

     

       8
        
         zstd,

     

       9
        
         scx-common,

     

       10
       -
         scx,

     

       11
        
         protobuf,

     

       12
        
         libseccomp,

     

       13
        
       }:

     
···

       16
        
         inherit (scx-common) version src;

     

       17
        
       

     

       18
        
         inherit (scx-common.versionInfo.scx) cargoHash;

     

       19
       -
       

     

       20
       -
         # Copy compiled headers and libs from scx.cscheds

     

       21
       -
         postPatch = ''

     

       22
       -
           mkdir libbpf

     

       23
       -
           cp -r ${scx.cscheds.dev}/libbpf/* libbpf/

     

       24
       -
         '';

     

       25
        
       

     

       26
        
         nativeBuildInputs = [

     

       27
        
           pkg-config

     
···

       37
        
       

     

       38
        
         env = {

     

       39
        
           BPF_CLANG = lib.getExe llvmPackages.clang;

     

       40
       -
           BPF_EXTRA_CFLAGS_PRE_INCL = lib.concatStringsSep " " [

     

       41
       -
             "-I${scx.cscheds.dev}/libbpf/src/usr/include"

     

       42
       -
             "-I${scx.cscheds.dev}/libbpf/include/uapi"

     

       43
       -
             "-I${scx.cscheds.dev}/libbpf/include/linux"

     

       44
       -
           ];

     

       45
        
           RUSTFLAGS = lib.concatStringsSep " " [

     

       46
        
             "-C relocation-model=pic"

     

       47
        
             "-C link-args=-lelf"

     

       48
        
             "-C link-args=-lz"

     

       49
        
             "-C link-args=-lzstd"

     

       50
       -
             "-L ${scx.cscheds.dev}/libbpf/src"

     

       51
        
           ];

     

       52
        
         };

     

       53
        
       

     
···

       63
        
           "--skip=compat::tests::test_struct_has_field"

     

       64
        
           "--skip=cpumask"

     

       65
        
           "--skip=topology"

     

       0
        
       
     

       66
        
         ];

     

       67
        
       

     

       68
        
         meta = scx-common.meta // {

···

       7
        
         zlib,

     

       8
        
         zstd,

     

       9
        
         scx-common,

     

       0
        
       
     

       10
        
         protobuf,

     

       11
        
         libseccomp,

     

       12
        
       }:

     
···

       15
        
         inherit (scx-common) version src;

     

       16
        
       

     

       17
        
         inherit (scx-common.versionInfo.scx) cargoHash;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       18
        
       

     

       19
        
         nativeBuildInputs = [

     

       20
        
           pkg-config

     
···

       30
        
       

     

       31
        
         env = {

     

       32
        
           BPF_CLANG = lib.getExe llvmPackages.clang;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       33
        
           RUSTFLAGS = lib.concatStringsSep " " [

     

       34
        
             "-C relocation-model=pic"

     

       35
        
             "-C link-args=-lelf"

     

       36
        
             "-C link-args=-lz"

     

       37
        
             "-C link-args=-lzstd"

     

       0
        
       
     

       38
        
           ];

     

       39
        
         };

     

       40
        
       

     
···

       50
        
           "--skip=compat::tests::test_struct_has_field"

     

       51
        
           "--skip=cpumask"

     

       52
        
           "--skip=topology"

     

       53
       +
           "--skip=proc_data::tests::test_thread_operations"

     

       54
        
         ];

     

       55
        
       

     

       56
        
         meta = scx-common.meta // {

+5 -5

pkgs/os-specific/linux/scx/version.json

···

       1
        
       {

     

       2
        
         "scx": {

     

       3
       -
           "version": "1.0.14",

     

       4
       -
           "hash": "sha256-Wh+8vaQO93Erj+z8S2C633UDmUrFjQc3Bg+Nm7EML0E=",

     

       5
       -
           "cargoHash": "sha256-6uiDx2/5ZcYkz8x8vuOTEUclIttzxVMvh1Q6QHg9N6E="

     

       6
        
         },

     

       7
        
         "bpftool": {

     

       8
        
           "rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e",

     

       9
        
           "hash": "sha256-ZZly6csVWOmtLmld1fhSDUqyRgZx2gSMGXTaSASGv7c="

     

       10
        
         },

     

       11
        
         "libbpf": {

     

       12
       -
           "rev": "c5f22aca0f3aa855daa159b2777472b35e721804",

     

       13
       -
           "hash": "sha256-ggGVqAkdZt28KAx+LztVIYGxj0j79hKcPKmUy8TrJy8="

     

       14
        
         }

     

       15
        
       }

···

       1
        
       {

     

       2
        
         "scx": {

     

       3
       +
           "version": "1.0.15",

     

       4
       +
           "hash": "sha256-HZIcJVWb0prkCjoSw7hd4JKve+unWFnfz9bGXZaF6EA=",

     

       5
       +
           "cargoHash": "sha256-CRk8vLwSylNM5M9j0iwRbAmzAREUOJAl28BdY2o1zGs="

     

       6
        
         },

     

       7
        
         "bpftool": {

     

       8
        
           "rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e",

     

       9
        
           "hash": "sha256-ZZly6csVWOmtLmld1fhSDUqyRgZx2gSMGXTaSASGv7c="

     

       10
        
         },

     

       11
        
         "libbpf": {

     

       12
       +
           "rev": "b4fa3e39a77fd65574fb5f899486795fc3d89bd9",

     

       13
       +
           "hash": "sha256-wlymVgcLlGCUOC92CkYU6QZZnqx8nidSfhr1pTiS8aM="

     

       14
        
         }

     

       15
        
       }

+3 -2

pkgs/os-specific/linux/tmon/default.nix

···

       2
        
         lib,

     

       3
        
         stdenv,

     

       4
        
         kernel,

     

       5
       -
         kernelModuleMakeFlags,

     

       6
        
         ncurses,

     

       7
        
       }:

     

       8
        
       

     
···

       18
        
           cd tools/thermal/tmon

     

       19
        
         '';

     

       20
        
       

     

       21
       -
         makeFlags = kernelModuleMakeFlags ++ [

     

       0
        
       
     

       0
        
       
     

       22
        
           "INSTALL_ROOT=\"$(out)\""

     

       23
        
           "BINDIR=bin"

     

       24
        
         ];

···

       2
        
         lib,

     

       3
        
         stdenv,

     

       4
        
         kernel,

     

       0
        
       
     

       5
        
         ncurses,

     

       6
        
       }:

     

       7
        
       

     
···

       17
        
           cd tools/thermal/tmon

     

       18
        
         '';

     

       19
        
       

     

       20
       +
         makeFlags = [

     

       21
       +
           "ARCH=${stdenv.hostPlatform.linuxArch}"

     

       22
       +
           "CROSS_COMPILE=${stdenv.cc.targetPrefix}"

     

       23
        
           "INSTALL_ROOT=\"$(out)\""

     

       24
        
           "BINDIR=bin"

     

       25
        
         ];

+10 -5

pkgs/tools/compression/zstd/default.nix

···

       25
        
         python3Packages,

     

       26
        
         haskellPackages,

     

       27
        
         testers,

     

       28
       -
         zstd,

     

       29
        
       }:

     

       30
        
       

     

       31
       -
       stdenv.mkDerivation rec {

     

       32
        
         pname = "zstd";

     

       33
        
         version = "1.5.7";

     

       34
        
       

     

       35
        
         src = fetchFromGitHub {

     

       36
        
           owner = "facebook";

     

       37
        
           repo = "zstd";

     

       38
       -
           rev = "v${version}";

     

       39
        
           hash = "sha256-tNFWIT9ydfozB8dWcmTMuZLCQmQudTFJIkSr0aG7S44=";

     

       40
        
         };

     

       41
        
       

     
···

       122
        
         passthru = {

     

       123
        
           updateScript = nix-update-script { };

     

       124
        
           tests = {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       125
        
             inherit libarchive rocksdb arrow-cpp;

     

       126
        
             libzip = libzip.override { withZstd = true; };

     

       127
        
             curl = curl.override { zstdSupport = true; };

     

       128
        
             python-zstd = python3Packages.zstd;

     

       129
        
             haskell-zstd = haskellPackages.zstd;

     

       130
        
             haskell-hs-zstd = haskellPackages.hs-zstd;

     

       131
       -
             pkg-config = testers.hasPkgConfigModules { package = zstd; };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       132
        
           };

     

       133
        
         };

     

       134
        
       

     
···

       151
        
           maintainers = with maintainers; [ orivej ];

     

       152
        
           pkgConfigModules = [ "libzstd" ];

     

       153
        
         };

     

       154
       -
       }

···

       25
        
         python3Packages,

     

       26
        
         haskellPackages,

     

       27
        
         testers,

     

       0
        
       
     

       28
        
       }:

     

       29
        
       

     

       30
       +
       stdenv.mkDerivation (finalAttrs: {

     

       31
        
         pname = "zstd";

     

       32
        
         version = "1.5.7";

     

       33
        
       

     

       34
        
         src = fetchFromGitHub {

     

       35
        
           owner = "facebook";

     

       36
        
           repo = "zstd";

     

       37
       +
           rev = "v${finalAttrs.version}";

     

       38
        
           hash = "sha256-tNFWIT9ydfozB8dWcmTMuZLCQmQudTFJIkSr0aG7S44=";

     

       39
        
         };

     

       40
        
       

     
···

       121
        
         passthru = {

     

       122
        
           updateScript = nix-update-script { };

     

       123
        
           tests = {

     

       124
       +
       

     

       125
       +
             # Reverse dependencies

     

       126
       +
       

     

       127
        
             inherit libarchive rocksdb arrow-cpp;

     

       128
        
             libzip = libzip.override { withZstd = true; };

     

       129
        
             curl = curl.override { zstdSupport = true; };

     

       130
        
             python-zstd = python3Packages.zstd;

     

       131
        
             haskell-zstd = haskellPackages.zstd;

     

       132
        
             haskell-hs-zstd = haskellPackages.hs-zstd;

     

       133
       +
       

     

       134
       +
             # Package tests (coherent with overrides)

     

       135
       +
       

     

       136
       +
             pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };

     

       137
        
           };

     

       138
        
         };

     

       139
        
       

     
···

       156
        
           maintainers = with maintainers; [ orivej ];

     

       157
        
           pkgConfigModules = [ "libzstd" ];

     

       158
        
         };

     

       159
       +
       })

-8

pkgs/top-level/all-packages.nix

···

       11606
        
       

     

       11607
        
         fclones = callPackage ../tools/misc/fclones { };

     

       11608
        
       

     

       11609
       -
         feh = callPackage ../applications/graphics/feh {

     

       11610
       -
           imlib2 = imlib2Full;

     

       11611
       -
         };

     

       11612
       -
       

     

       11613
        
         buildMozillaMach =

     

       11614
        
           opts: callPackage (import ../build-support/build-mozilla-mach/default.nix opts) { };

     

       11615
        
       

     
···

       11827
        
         pattypan = callPackage ../applications/misc/pattypan {

     

       11828
        
           jdk = jdk.override { enableJavaFX = true; };

     

       11829
        
         };

     

       11830
       -
       

     

       11831
       -
         gnunet = callPackage ../applications/networking/p2p/gnunet { };

     

       11832
       -
       

     

       11833
       -
         gnunet-gtk = callPackage ../applications/networking/p2p/gnunet/gtk.nix { };

     

       11834
        
       

     

       11835
        
         gphoto2 = callPackage ../applications/misc/gphoto2 { };

     

       11836

···

       11606
        
       

     

       11607
        
         fclones = callPackage ../tools/misc/fclones { };

     

       11608
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       11609
        
         buildMozillaMach =

     

       11610
        
           opts: callPackage (import ../build-support/build-mozilla-mach/default.nix opts) { };

     

       11611
        
       

     
···

       11823
        
         pattypan = callPackage ../applications/misc/pattypan {

     

       11824
        
           jdk = jdk.override { enableJavaFX = true; };

     

       11825
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       11826
        
       

     

       11827
        
         gphoto2 = callPackage ../applications/misc/gphoto2 { };

     

       11828