commit c64ae284c0cb2001cd3cc9d1160ce774635217e0 · pyrox.dev/nixpkgs

+1 -1

ci/OWNERS

···

       228
       228
        
       /pkgs/tools/misc/esphome @mweinelt

     

       229
       229
        
       

     

       230
       230
        
       # Network Time Daemons

     

       231
       231
       -
       /pkgs/tools/networking/chrony @thoughtpolice

     

       231
       231
       +
       /pkgs/by-name/ch/chrony @thoughtpolice

     

       232
       232
        
       /pkgs/tools/networking/ntp @thoughtpolice

     

       233
       233
        
       /pkgs/tools/networking/openntpd @thoughtpolice

     

       234
       234
        
       /nixos/modules/services/networking/ntp @thoughtpolice

nixos/doc/manual/release-notes/rl-2411.section.md

···

       205
       205
        
       

     

       206
       206
        
       - `grafana` has been updated to version 11.1. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected.

     

       207
       207
        
       

     

       208
       208
       +
       - `deno` has been updated to v2 which has breaking changes. Upstream will be abandoning v1 soon but for now you can use `deno_1` if you are yet to migrate (will be removed prior to cutting a final 24.11 release).

     

       209
       209
       +
       

     

       208
       210
        
       - `knot-dns` has been updated to version 3.4.x. Check the [migration guide](https://www.knot-dns.cz/docs/latest/html/migration.html#upgrade-3-3-x-to-3-4-x) for breaking changes.

     

       209
       211
        
       

     

       210
       212
        
       - `services.kubernetes.kubelet.clusterDns` now accepts a list of DNS resolvers rather than a single string, bringing the module more in line with the upstream Kubelet configuration schema.

+80 -3

nixos/modules/security/pam.nix

···

       287
       287
        
               '';

     

       288
       288
        
             };

     

       289
       289
        
       

     

       290
       290
       +
             rssh = lib.mkOption {

     

       291
       291
       +
               default = false;

     

       292
       292
       +
               type = lib.types.bool;

     

       293
       293
       +
               description = ''

     

       294
       294
       +
                 If set, the calling user's SSH agent is used to authenticate

     

       295
       295
       +
                 against the configured keys. This module works in a manner

     

       296
       296
       +
                 similar to pam_ssh_agent_auth, but supports a wider range

     

       297
       297
       +
                 of SSH key types, including those protected by security

     

       298
       298
       +
                 keys (FIDO2).

     

       299
       299
       +
               '';

     

       300
       300
       +
             };

     

       301
       301
       +
       

     

       290
       302
        
             duoSecurity = {

     

       291
       303
        
               enable = lib.mkOption {

     

       292
       304
        
                 default = false;

     
···

       673
       685
        
                 { name = "ssh_agent_auth"; enable = config.security.pam.sshAgentAuth.enable && cfg.sshAgentAuth; control = "sufficient"; modulePath = "${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so"; settings = {

     

       674
       686
        
                   file = lib.concatStringsSep ":" config.security.pam.sshAgentAuth.authorizedKeysFiles;

     

       675
       687
        
                 }; }

     

       688
       688
       +
                 (let inherit (config.security.pam) rssh; in { name = "rssh"; enable = rssh.enable && cfg.rssh; control = "sufficient"; modulePath = "${pkgs.pam_rssh}/lib/libpam_rssh.so"; inherit (rssh) settings; })

     

       676
       689
        
                 (let p11 = config.security.pam.p11; in { name = "p11"; enable = cfg.p11Auth; control = p11.control; modulePath = "${pkgs.pam_p11}/lib/security/pam_p11.so"; args = [

     

       677
       690
        
                   "${pkgs.opensc}/lib/opensc-pkcs11.so"

     

       678
       691
        
                 ]; })

     
···

       950
       963
        
             value.source = pkgs.writeText "${name}.pam" service.text;

     

       951
       964
        
           };

     

       952
       965
        
       

     

       953
       953
       -
         optionalSudoConfigForSSHAgentAuth = lib.optionalString config.security.pam.sshAgentAuth.enable ''

     

       954
       954
       -
           # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic.

     

       966
       966
       +
         optionalSudoConfigForSSHAgentAuth = lib.optionalString

     

       967
       967
       +
           (config.security.pam.sshAgentAuth.enable || config.security.pam.rssh.enable) ''

     

       968
       968
       +
           # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so and libpam_rssh.so can do their magic.

     

       955
       969
        
           Defaults env_keep+=SSH_AUTH_SOCK

     

       956
       970
        
         '';

     

       957
       971
        
       

     
···

       1068
       1082
        
             };

     

       1069
       1083
        
           };

     

       1070
       1084
        
       

     

       1085
       1085
       +
           security.pam.rssh = {

     

       1086
       1086
       +
             enable = lib.mkEnableOption "authenticating using a signature performed by the ssh-agent";

     

       1087
       1087
       +
       

     

       1088
       1088
       +
             settings = lib.mkOption {

     

       1089
       1089
       +
               type = lib.types.submodule {

     

       1090
       1090
       +
                 freeformType = moduleSettingsType;

     

       1091
       1091
       +
                 options = {

     

       1092
       1092
       +
                   auth_key_file = lib.mkOption {

     

       1093
       1093
       +
                     type = with lib.types; nullOr nonEmptyStr;

     

       1094
       1094
       +
                     description = ''

     

       1095
       1095
       +
                       Path to file with trusted public keys in OpenSSH's `authorized_keys` format. The following

     

       1096
       1096
       +
                       variables are expanded to the respective PAM items:

     

       1097
       1097
       +
       

     

       1098
       1098
       +
                       - `service`: `PAM_SERVICE`, the service name,

     

       1099
       1099
       +
                       - `user`: `PAM_USER`, the username of the entity under whose identity service will be given,

     

       1100
       1100
       +
                       - `tty`: `PAM_TTY`, the terminal name,

     

       1101
       1101
       +
                       - `rhost`: `PAM_RHOST`, the requesting hostname, and

     

       1102
       1102
       +
                       - `ruser`: `PAM_RUSER`, the requesting entity.

     

       1103
       1103
       +
       

     

       1104
       1104
       +
                       These PAM items are explained in {manpage}`pam_get_item(3)`.

     

       1105
       1105
       +
       

     

       1106
       1106
       +
                       Variables may be specified as `$var`, `''${var}` or `''${var:defaultValue}`.

     

       1107
       1107
       +
       

     

       1108
       1108
       +
                       ::: {.note}

     

       1109
       1109
       +
                       Specifying user-writeable files here results in an insecure configuration: a malicious process

     

       1110
       1110
       +
                       can then edit such an `authorized_keys` file and bypass the ssh-agent-based authentication.

     

       1111
       1111
       +
       

     

       1112
       1112
       +
                       This option is ignored if {option}`security.pam.rssh.settings.authorized_keys_command` is set.

     

       1113
       1113
       +
       

     

       1114
       1114
       +
                       If both this option and {option}`security.pam.rssh.settings.authorized_keys_command` are unset,

     

       1115
       1115
       +
                       the keys will be read from `''${HOME}/.ssh/authorized_keys`, which should be considered

     

       1116
       1116
       +
                       insecure.

     

       1117
       1117
       +
                     '';

     

       1118
       1118
       +
                     default = "/etc/ssh/authorized_keys.d/$ruser";

     

       1119
       1119
       +
                   };

     

       1120
       1120
       +
                 };

     

       1121
       1121
       +
               };

     

       1122
       1122
       +
       

     

       1123
       1123
       +
               default = { };

     

       1124
       1124
       +
               description = ''

     

       1125
       1125
       +
                 Options to pass to the pam_rssh module. Refer to

     

       1126
       1126
       +
                 <https://github.com/z4yx/pam_rssh/blob/main/README.md#optional-arguments>

     

       1127
       1127
       +
                 for supported values.

     

       1128
       1128
       +
       

     

       1129
       1129
       +
                 ${moduleSettingsDescription}

     

       1130
       1130
       +
               '';

     

       1131
       1131
       +
             };

     

       1132
       1132
       +
           };

     

       1133
       1133
       +
       

     

       1071
       1134
        
           security.pam.enableOTPW = lib.mkEnableOption "the OTPW (one-time password) PAM module";

     

       1072
       1135
        
       

     

       1073
       1136
        
           security.pam.dp9ik = {

     
···

       1512
       1575
        
                 Did you forget to set `services.openssh.enable` ?

     

       1513
       1576
        
               '';

     

       1514
       1577
        
             }

     

       1578
       1578
       +
             {

     

       1579
       1579
       +
               assertion = with config.security.pam.rssh;

     

       1580
       1580
       +
                 enable -> (settings.auth_key_file or null != null || settings.authorized_keys_command or null != null);

     

       1581
       1581
       +
               message = ''

     

       1582
       1582
       +
                 security.pam.rssh.enable requires either security.pam.rssh.settings.auth_key_file or

     

       1583
       1583
       +
                 security.pam.rssh.settings.authorized_keys_command to be set.

     

       1584
       1584
       +
               '';

     

       1585
       1585
       +
             }

     

       1515
       1586
        
           ];

     

       1516
       1587
        
       

     

       1517
       1588
        
           warnings = lib.optional

     

       1518
       1518
       -
             (with lib; with config.security.pam.sshAgentAuth;

     

       1589
       1589
       +
             (with config.security.pam.sshAgentAuth;

     

       1519
       1590
        
               enable && lib.any (s: lib.hasPrefix "%h" s || lib.hasPrefix "~" s) authorizedKeysFiles)

     

       1520
       1591
        
             ''config.security.pam.sshAgentAuth.authorizedKeysFiles contains files in the user's home directory.

     

       1521
       1592
        
       

     

       1522
       1593
        
               Specifying user-writeable files there result in an insecure configuration:

     

       1523
       1594
        
               a malicious process can then edit such an authorized_keys file and bypass the ssh-agent-based authentication.

     

       1524
       1595
        
               See https://github.com/NixOS/nixpkgs/issues/31611

     

       1596
       1596
       +
             '' ++ lib.optional

     

       1597
       1597
       +
             (with config.security.pam.rssh;

     

       1598
       1598
       +
               enable && settings.auth_key_file or null != null && settings.authorized_keys_command or null != null) ''

     

       1599
       1599
       +
               security.pam.rssh.settings.auth_key_file will be ignored as

     

       1600
       1600
       +
               security.pam.rssh.settings.authorized_keys_command has been specified.

     

       1601
       1601
       +
               Explictly set the former to null to silence this warning.

     

       1525
       1602
        
             '';

     

       1526
       1603
        
       

     

       1527
       1604
        
           environment.systemPackages =

+4 -3

pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix

···

       24
       24
        
             setuptools

     

       25
       25
        
             sexpdata

     

       26
       26
        
             six

     

       27
       27
       +
             watchdog

     

       27
       28
        
           ]

     

       28
       29
        
         );

     

       29
       30
        
       in

     

       30
       31
        
       melpaBuild {

     

       31
       32
        
         pname = "lsp-bridge";

     

       32
       32
       -
         version = "0-unstable-2024-10-04";

     

       33
       33
       +
         version = "0-unstable-2024-10-07";

     

       33
       34
        
       

     

       34
       35
        
         src = fetchFromGitHub {

     

       35
       36
        
           owner = "manateelazycat";

     

       36
       37
        
           repo = "lsp-bridge";

     

       37
       37
       -
           rev = "2d0cd0bea3bd503ca3bb7bcf4a6a78af091c7ecc";

     

       38
       38
       -
           hash = "sha256-q6xIYUhXTqGeR9tnjd1xnCOnOeOMypJN6vfGjZDuIIM=";

     

       38
       38
       +
           rev = "f726a341c283a5b84d3587cf84e40817b8ec72c6";

     

       39
       39
       +
           hash = "sha256-JL02pYjM5DyUt5wCNN0UnLVSXv9DCfSaSBGy5PzLvyA=";

     

       39
       40
        
         };

     

       40
       41
        
       

     

       41
       42
        
         patches = [

+5 -5

pkgs/applications/version-management/glab/default.nix pkgs/by-name/gl/glab/package.nix

···

       1
       1
       -
       { lib, buildGoModule, fetchFromGitLab, installShellFiles, stdenv }:

     

       1
       1
       +
       { lib, buildGo123Module, fetchFromGitLab, installShellFiles, stdenv }:

     

       2
       2
        
       

     

       3
       3
       -
       buildGoModule rec {

     

       3
       3
       +
       buildGo123Module rec {

     

       4
       4
        
         pname = "glab";

     

       5
       5
       -
         version = "1.45.0";

     

       5
       5
       +
         version = "1.47.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitLab {

     

       8
       8
        
           owner = "gitlab-org";

     

       9
       9
        
           repo = "cli";

     

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

     

       11
       11
       -
           hash = "sha256-jTpddpS+FYSQg2aRxQiVlG+bitiIqmZ4kxOJLPZkICo=";

     

       11
       11
       +
           hash = "sha256-mAM11nQ6YJJWNFOR9xQbgma7Plvo4MdcW2Syniw7o60=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorHash = "sha256-o0sYObTeDgG+3X3YEnDbk1h4DkEiMwEgYMF7hGjCL3Q=";

     

       14
       14
       +
         vendorHash = "sha256-uwSVdebZtIpSol553gJC0ItkEqa6qXXOAVFvzjsHSSI=";

     

       15
       15
        
       

     

       16
       16
        
         ldflags = [

     

       17
       17
        
           "-s"

+2 -2

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

···

       136
       136
        
       

     

       137
       137
        
       in {

     

       138
       138
        
         subversion = common {

     

       139
       139
       -
           version = "1.14.3";

     

       140
       140
       -
           sha256 = "sha256-lJ79RRoJQ19+hXNXTHHHtxsZTYRIkPpJzWHSJi6hpEA=";

     

       139
       139
       +
           version = "1.14.4";

     

       140
       140
       +
           sha256 = "sha256-ROrRFucuSA8Q8SPJFLtvn4wEFxHAQe16v/G4Y0oZnjw=";

     

       141
       141
        
         };

     

       142
       142
        
       }

+2 -2

pkgs/by-name/bi/biglybt/package.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "biglybt";

     

       12
       12
       -
         version = "3.6.0.0";

     

       12
       12
       +
         version = "3.7.0.0";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "https://github.com/BiglySoftware/BiglyBT/releases/download/v${version}/GitHub_BiglyBT_unix.tar.gz";

     

       16
       16
       -
           hash = "sha256-a7g9sB3orO2m0X7qNwQ1dDygYPhs/b6kX0RDSG8Wq2U=";

     

       16
       16
       +
           hash = "sha256-CfLKoX77yCanSzHq+Fy3jRqQAC2GeUo2SO9x0mk2Tf4=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ wrapGAppsHook3 ];

+116

pkgs/by-name/ch/chrony/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         overrideSDK,

     

       5
       5
       +
         fetchurl,

     

       6
       6
       +
         pkg-config,

     

       7
       7
       +
         gnutls,

     

       8
       8
       +
         libedit,

     

       9
       9
       +
         texinfo,

     

       10
       10
       +
         libcap,

     

       11
       11
       +
         libseccomp,

     

       12
       12
       +
         pps-tools,

     

       13
       13
       +
         nixosTests,

     

       14
       14
       +
       }:

     

       15
       15
       +
       

     

       16
       16
       +
       let

     

       17
       17
       +
         stdenv' =

     

       18
       18
       +
           if stdenv.hostPlatform.isDarwin then

     

       19
       19
       +
             overrideSDK stdenv {

     

       20
       20
       +
               darwinSdkVersion = "11.0";

     

       21
       21
       +
               darwinMinVersion = "10.13";

     

       22
       22
       +
             }

     

       23
       23
       +
           else

     

       24
       24
       +
             stdenv;

     

       25
       25
       +
       in

     

       26
       26
       +
       stdenv'.mkDerivation rec {

     

       27
       27
       +
         pname = "chrony";

     

       28
       28
       +
         version = "4.6.1";

     

       29
       29
       +
       

     

       30
       30
       +
         src = fetchurl {

     

       31
       31
       +
           url = "https://chrony-project.org/releases/${pname}-${version}.tar.gz";

     

       32
       32
       +
           hash = "sha256-Vx/3P78K4wl/BgTsouALHYuy6Rr/4aNJR4X/IdYZnFw=";

     

       33
       33
       +
         };

     

       34
       34
       +
       

     

       35
       35
       +
         outputs = [

     

       36
       36
       +
           "out"

     

       37
       37
       +
           "man"

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         nativeBuildInputs = [ pkg-config ];

     

       41
       41
       +
       

     

       42
       42
       +
         buildInputs =

     

       43
       43
       +
           [

     

       44
       44
       +
             gnutls

     

       45
       45
       +
             libedit

     

       46
       46
       +
             texinfo

     

       47
       47
       +
           ]

     

       48
       48
       +
           ++ lib.optionals stdenv.hostPlatform.isLinux [

     

       49
       49
       +
             libcap

     

       50
       50
       +
             libseccomp

     

       51
       51
       +
             pps-tools

     

       52
       52
       +
           ];

     

       53
       53
       +
       

     

       54
       54
       +
         configureFlags = [

     

       55
       55
       +
           "--enable-ntp-signd"

     

       56
       56
       +
           "--sbindir=$(out)/bin"

     

       57
       57
       +
           "--chronyrundir=/run/chrony"

     

       58
       58
       +
         ] ++ lib.optional stdenv.hostPlatform.isLinux "--enable-scfilter";

     

       59
       59
       +
       

     

       60
       60
       +
         patches = [

     

       61
       61
       +
           # Cleanup the installation script

     

       62
       62
       +
           ./makefile.patch

     

       63
       63
       +
         ];

     

       64
       64
       +
       

     

       65
       65
       +
         postPatch = ''

     

       66
       66
       +
           patchShebangs test

     

       67
       67
       +
       

     

       68
       68
       +
           # nts_ke_session unit test fails, so drop it.

     

       69
       69
       +
           # TODO: try again when updating?

     

       70
       70
       +
           rm test/unit/nts_ke_session.c

     

       71
       71
       +
         '';

     

       72
       72
       +
       

     

       73
       73
       +
         enableParallelBuilding = true;

     

       74
       74
       +
         doCheck = true;

     

       75
       75
       +
       

     

       76
       76
       +
         hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];

     

       77
       77
       +
       

     

       78
       78
       +
         passthru.tests = {

     

       79
       79
       +
           inherit (nixosTests) chrony chrony-ptp;

     

       80
       80
       +
         };

     

       81
       81
       +
       

     

       82
       82
       +
         meta = {

     

       83
       83
       +
           description = "Sets your computer's clock from time servers on the Net";

     

       84
       84
       +
           homepage = "https://chrony-project.org/";

     

       85
       85
       +
           license = lib.licenses.gpl2Only;

     

       86
       86
       +
           platforms =

     

       87
       87
       +
             with lib.platforms;

     

       88
       88
       +
             builtins.concatLists [

     

       89
       89
       +
               linux

     

       90
       90
       +
               freebsd

     

       91
       91
       +
               netbsd

     

       92
       92
       +
               darwin

     

       93
       93
       +
               illumos

     

       94
       94
       +
             ];

     

       95
       95
       +
           maintainers = with lib.maintainers; [

     

       96
       96
       +
             fpletz

     

       97
       97
       +
             thoughtpolice

     

       98
       98
       +
             vifino

     

       99
       99
       +
           ];

     

       100
       100
       +
       

     

       101
       101
       +
           longDescription = ''

     

       102
       102
       +
             Chronyd is a daemon which runs in background on the system. It obtains

     

       103
       103
       +
             measurements via the network of the system clock’s offset relative to

     

       104
       104
       +
             time servers on other systems and adjusts the system time accordingly.

     

       105
       105
       +
             For isolated systems, the user can periodically enter the correct time by

     

       106
       106
       +
             hand (using Chronyc). In either case, Chronyd determines the rate at

     

       107
       107
       +
             which the computer gains or loses time, and compensates for this. Chronyd

     

       108
       108
       +
             implements the NTP protocol and can act as either a client or a server.

     

       109
       109
       +
       

     

       110
       110
       +
             Chronyc provides a user interface to Chronyd for monitoring its

     

       111
       111
       +
             performance and configuring various settings. It can do so while running

     

       112
       112
       +
             on the same computer as the Chronyd instance it is controlling or a

     

       113
       113
       +
             different computer.

     

       114
       114
       +
           '';

     

       115
       115
       +
         };

     

       116
       116
       +
       }

+12

pkgs/by-name/de/deno/1/librusty_v8.nix

···

       1
       1
       +
       # auto-generated file -- DO NOT EDIT!

     

       2
       2
       +
       { fetchLibrustyV8 }:

     

       3
       3
       +
       

     

       4
       4
       +
       fetchLibrustyV8 {

     

       5
       5
       +
         version = "0.105.0";

     

       6
       6
       +
         shas = {

     

       7
       7
       +
           x86_64-linux = "sha256-9yON4DNPxm4IUZSLZp9VZtzSRPPWX1tEuQLVJmN8cLs=";

     

       8
       8
       +
           aarch64-linux = "sha256-5vAjw2vimjCHKPxjIp5vcwMCWUUDYVlk4QyOeEI0DLY=";

     

       9
       9
       +
           x86_64-darwin = "sha256-o4WRkg4ptiJTNMkorn5K+P8xOJwpChM5PqkZCjP076g=";

     

       10
       10
       +
           aarch64-darwin = "sha256-ZuWBnvxu1PgDtjtguxtj3BhFO01AChlbjAS0kZUws3A=";

     

       11
       11
       +
         };

     

       12
       12
       +
       }

+118

pkgs/by-name/de/deno/1/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         stdenv,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         callPackage,

     

       5
       5
       +
         fetchFromGitHub,

     

       6
       6
       +
         rustPlatform,

     

       7
       7
       +
         cmake,

     

       8
       8
       +
         protobuf,

     

       9
       9
       +
         installShellFiles,

     

       10
       10
       +
         libiconv,

     

       11
       11
       +
         darwin,

     

       12
       12
       +
         librusty_v8 ? callPackage ./librusty_v8.nix {

     

       13
       13
       +
           inherit (callPackage ../fetchers.nix { }) fetchLibrustyV8;

     

       14
       14
       +
         },

     

       15
       15
       +
       }:

     

       16
       16
       +
       rustPlatform.buildRustPackage rec {

     

       17
       17
       +
         pname = "deno";

     

       18
       18
       +
         version = "1.46.3";

     

       19
       19
       +
       

     

       20
       20
       +
         src = fetchFromGitHub {

     

       21
       21
       +
           owner = "denoland";

     

       22
       22
       +
           repo = "deno";

     

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

     

       24
       24
       +
           hash = "sha256-AM6SjcIHo6Koxcnznhkv3cXoKaMy2TEVpiWe/bczDuA=";

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         cargoHash = "sha256-D+CZpb6OTzM5Il0k8GQB7qSONy4myE5yKlaSkLLqHT8=";

     

       28
       28
       +
       

     

       29
       29
       +
         postPatch = ''

     

       30
       30
       +
           # upstream uses lld on aarch64-darwin for faster builds

     

       31
       31
       +
           # within nix lld looks for CoreFoundation rather than CoreFoundation.tbd and fails

     

       32
       32
       +
           substituteInPlace .cargo/config.toml --replace "-fuse-ld=lld " ""

     

       33
       33
       +
         '';

     

       34
       34
       +
       

     

       35
       35
       +
         # uses zlib-ng but can't dynamically link yet

     

       36
       36
       +
         # https://github.com/rust-lang/libz-sys/issues/158

     

       37
       37
       +
         nativeBuildInputs = [

     

       38
       38
       +
           # required by libz-ng-sys crate

     

       39
       39
       +
           cmake

     

       40
       40
       +
           # required by deno_kv crate

     

       41
       41
       +
           protobuf

     

       42
       42
       +
           installShellFiles

     

       43
       43
       +
         ];

     

       44
       44
       +
         buildInputs = lib.optionals stdenv.isDarwin (

     

       45
       45
       +
           [

     

       46
       46
       +
             libiconv

     

       47
       47
       +
             darwin.libobjc

     

       48
       48
       +
           ]

     

       49
       49
       +
           ++ (with darwin.apple_sdk_11_0.frameworks; [

     

       50
       50
       +
             Security

     

       51
       51
       +
             CoreServices

     

       52
       52
       +
             Metal

     

       53
       53
       +
             MetalPerformanceShaders

     

       54
       54
       +
             Foundation

     

       55
       55
       +
             QuartzCore

     

       56
       56
       +
           ])

     

       57
       57
       +
         );

     

       58
       58
       +
       

     

       59
       59
       +
         buildAndTestSubdir = "cli";

     

       60
       60
       +
       

     

       61
       61
       +
         # work around "error: unknown warning group '-Wunused-but-set-parameter'"

     

       62
       62
       +
         env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unknown-warning-option";

     

       63
       63
       +
         # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem

     

       64
       64
       +
         # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE

     

       65
       65
       +
         env.RUSTY_V8_ARCHIVE = librusty_v8;

     

       66
       66
       +
       

     

       67
       67
       +
         # Tests have some inconsistencies between runs with output integration tests

     

       68
       68
       +
         # Skipping until resolved

     

       69
       69
       +
         doCheck = false;

     

       70
       70
       +
       

     

       71
       71
       +
         preInstall = ''

     

       72
       72
       +
           find ./target -name libswc_common${stdenv.hostPlatform.extensions.sharedLibrary} -delete

     

       73
       73
       +
         '';

     

       74
       74
       +
       

     

       75
       75
       +
         postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

     

       76
       76
       +
           installShellCompletion --cmd deno \

     

       77
       77
       +
             --bash <($out/bin/deno completions bash) \

     

       78
       78
       +
             --fish <($out/bin/deno completions fish) \

     

       79
       79
       +
             --zsh <($out/bin/deno completions zsh)

     

       80
       80
       +
         '';

     

       81
       81
       +
       

     

       82
       82
       +
         doInstallCheck = true;

     

       83
       83
       +
         installCheckPhase = ''

     

       84
       84
       +
           runHook preInstallCheck

     

       85
       85
       +
           $out/bin/deno --help

     

       86
       86
       +
           $out/bin/deno --version | grep "deno ${version}"

     

       87
       87
       +
           runHook postInstallCheck

     

       88
       88
       +
         '';

     

       89
       89
       +
       

     

       90
       90
       +
         passthru.tests = callPackage ./tests { };

     

       91
       91
       +
       

     

       92
       92
       +
         meta = with lib; {

     

       93
       93
       +
           homepage = "https://deno.land/";

     

       94
       94
       +
           changelog = "https://github.com/denoland/deno/releases/tag/v${version}";

     

       95
       95
       +
           description = "Secure runtime for JavaScript and TypeScript";

     

       96
       96
       +
           longDescription = ''

     

       97
       97
       +
             Deno aims to be a productive and secure scripting environment for the modern programmer.

     

       98
       98
       +
             Deno will always be distributed as a single executable.

     

       99
       99
       +
             Given a URL to a Deno program, it is runnable with nothing more than the ~15 megabyte zipped executable.

     

       100
       100
       +
             Deno explicitly takes on the role of both runtime and package manager.

     

       101
       101
       +
             It uses a standard browser-compatible protocol for loading modules: URLs.

     

       102
       102
       +
             Among other things, Deno is a great replacement for utility scripts that may have been historically written with

     

       103
       103
       +
             bash or python.

     

       104
       104
       +
           '';

     

       105
       105
       +
           license = licenses.mit;

     

       106
       106
       +
           mainProgram = "deno";

     

       107
       107
       +
           maintainers = with maintainers; [ jk ];

     

       108
       108
       +
           platforms = [

     

       109
       109
       +
             "x86_64-linux"

     

       110
       110
       +
             "aarch64-linux"

     

       111
       111
       +
             "x86_64-darwin"

     

       112
       112
       +
             "aarch64-darwin"

     

       113
       113
       +
           ];

     

       114
       114
       +
           # NOTE: `aligned_alloc` error on darwin SDK < 10.15. Can't do usual overrideSDK with rust toolchain in current implementation.

     

       115
       115
       +
           # Should be fixed with darwin SDK refactor and can be revisited.

     

       116
       116
       +
           badPlatforms = [ "x86_64-darwin" ];

     

       117
       117
       +
         };

     

       118
       118
       +
       }

pkgs/by-name/de/deno/1/tests/basic.ts

···

       1
       1
       +
       console.log(1 + 1)

+79

pkgs/by-name/de/deno/1/tests/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         deno,

     

       3
       3
       +
         runCommand,

     

       4
       4
       +
         lib,

     

       5
       5
       +
         testers,

     

       6
       6
       +
       }:

     

       7
       7
       +
       let

     

       8
       8
       +
         testDenoRun =

     

       9
       9
       +
           name:

     

       10
       10
       +
           {

     

       11
       11
       +
             args ? "",

     

       12
       12
       +
             dir ? ./. + "/${name}",

     

       13
       13
       +
             file ? "index.ts",

     

       14
       14
       +
             expected ? "",

     

       15
       15
       +
             expectFailure ? false,

     

       16
       16
       +
           }:

     

       17
       17
       +
           let

     

       18
       18
       +
             command = "deno run ${args} ${dir}/${file}";

     

       19
       19
       +
           in

     

       20
       20
       +
           runCommand "deno-test-${name}"

     

       21
       21
       +
             {

     

       22
       22
       +
               nativeBuildInputs = [ deno ];

     

       23
       23
       +
               meta.timeout = 60;

     

       24
       24
       +
             }

     

       25
       25
       +
             ''

     

       26
       26
       +
               HOME=$(mktemp -d)

     

       27
       27
       +
               if output=$(${command} 2>&1); then

     

       28
       28
       +
                 if [[ $output =~ '${expected}' ]]; then

     

       29
       29
       +
                   echo "Test '${name}' passed"

     

       30
       30
       +
                   touch $out

     

       31
       31
       +
                 else

     

       32
       32
       +
                   echo -n ${lib.escapeShellArg command} >&2

     

       33
       33
       +
                   echo " output did not match what was expected." >&2

     

       34
       34
       +
                   echo "The expected was:" >&2

     

       35
       35
       +
                   echo '${expected}' >&2

     

       36
       36
       +
                   echo "The output was:" >&2

     

       37
       37
       +
                   echo "$output" >&2

     

       38
       38
       +
                   exit 1

     

       39
       39
       +
                 fi

     

       40
       40
       +
               else

     

       41
       41
       +
                 if [[ "${toString expectFailure}" == "1" ]]; then

     

       42
       42
       +
                   echo "Test '${name}' failed as expected"

     

       43
       43
       +
                   touch $out

     

       44
       44
       +
                   exit 0

     

       45
       45
       +
                 fi

     

       46
       46
       +
                 echo -n ${lib.escapeShellArg command} >&2

     

       47
       47
       +
                 echo " returned a non-zero exit code." >&2

     

       48
       48
       +
                 echo "$output" >&2

     

       49
       49
       +
                 exit 1

     

       50
       50
       +
               fi

     

       51
       51
       +
             '';

     

       52
       52
       +
       in

     

       53
       53
       +
       (lib.mapAttrs testDenoRun {

     

       54
       54
       +
         basic = {

     

       55
       55
       +
           dir = ./.;

     

       56
       56
       +
           file = "basic.ts";

     

       57
       57
       +
           expected = "2";

     

       58
       58
       +
         };

     

       59
       59
       +
         import-json = {

     

       60
       60
       +
           expected = "hello from JSON";

     

       61
       61
       +
         };

     

       62
       62
       +
         import-ts = {

     

       63
       63
       +
           expected = "hello from ts";

     

       64
       64
       +
         };

     

       65
       65
       +
         read-file = {

     

       66
       66
       +
           args = "--allow-read";

     

       67
       67
       +
           expected = "hello from a file";

     

       68
       68
       +
         };

     

       69
       69
       +
         fail-read-file = {

     

       70
       70
       +
           expectFailure = true;

     

       71
       71
       +
           dir = ./read-file;

     

       72
       72
       +
         };

     

       73
       73
       +
       })

     

       74
       74
       +
       // {

     

       75
       75
       +
         version = testers.testVersion {

     

       76
       76
       +
           package = deno;

     

       77
       77
       +
           command = "deno --version";

     

       78
       78
       +
         };

     

       79
       79
       +
       }

pkgs/by-name/de/deno/1/tests/import-json/data.json

···

       1
       1
       +
       { "msg": "hello from JSON" }

pkgs/by-name/de/deno/1/tests/import-json/index.ts

···

       1
       1
       +
       import file from "./data.json" assert { type: "json" };

     

       2
       2
       +
       console.log(file.msg);

pkgs/by-name/de/deno/1/tests/import-ts/index.ts

···

       1
       1
       +
       import { sayHello } from "./lib.ts"

     

       2
       2
       +
       

     

       3
       3
       +
       sayHello("ts")

pkgs/by-name/de/deno/1/tests/import-ts/lib.ts

···

       1
       1
       +
       export function sayHello(thing: string) {

     

       2
       2
       +
         console.log(`hello from ${thing}`);

     

       3
       3
       +
       }

pkgs/by-name/de/deno/1/tests/read-file/data.txt

···

       1
       1
       +
       hello from a file

pkgs/by-name/de/deno/1/tests/read-file/index.ts

···

       1
       1
       +
       // trim 'file://' prefix

     

       2
       2
       +
       const thisDir = Deno.mainModule.substring(7, Deno.mainModule.length);

     

       3
       3
       +
       const getParent = (path: string) => path.substring(0, path.lastIndexOf("/"))

     

       4
       4
       +
       const text = await Deno.readTextFile(getParent(thisDir) + "/data.txt");

     

       5
       5
       +
       console.log(text);

+21

pkgs/by-name/de/deno/fetchers.nix

···

       1
       1
       +
       # not a stable interface, do not reference outside the deno package but make a

     

       2
       2
       +
       # copy if you need

     

       3
       3
       +
       {

     

       4
       4
       +
         lib,

     

       5
       5
       +
         stdenv,

     

       6
       6
       +
         fetchurl,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       {

     

       10
       10
       +
         fetchLibrustyV8 =

     

       11
       11
       +
           args:

     

       12
       12
       +
           fetchurl {

     

       13
       13
       +
             name = "librusty_v8-${args.version}";

     

       14
       14
       +
             url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz";

     

       15
       15
       +
             sha256 = args.shas.${stdenv.hostPlatform.system};

     

       16
       16
       +
             meta = {

     

       17
       17
       +
               inherit (args) version;

     

       18
       18
       +
               sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

     

       19
       19
       +
             };

     

       20
       20
       +
           };

     

       21
       21
       +
       }

+7 -18

pkgs/by-name/de/deno/librusty_v8.nix

···

       1
       1
        
       # auto-generated file -- DO NOT EDIT!

     

       2
       2
       -
       { lib, stdenv, fetchurl }:

     

       2
       2
       +
       { fetchLibrustyV8 }:

     

       3
       3
        
       

     

       4
       4
       -
       let

     

       5
       5
       -
         fetch_librusty_v8 = args: fetchurl {

     

       6
       6
       -
           name = "librusty_v8-${args.version}";

     

       7
       7
       -
           url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz";

     

       8
       8
       -
           sha256 = args.shas.${stdenv.hostPlatform.system};

     

       9
       9
       -
           meta = {

     

       10
       10
       -
             inherit (args) version;

     

       11
       11
       -
             sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

     

       12
       12
       -
           };

     

       13
       13
       -
         };

     

       14
       14
       -
       in

     

       15
       15
       -
       fetch_librusty_v8 {

     

       16
       16
       -
         version = "0.105.0";

     

       4
       4
       +
       fetchLibrustyV8 {

     

       5
       5
       +
         version = "0.106.0";

     

       17
       6
        
         shas = {

     

       18
       18
       -
           x86_64-linux = "sha256-9yON4DNPxm4IUZSLZp9VZtzSRPPWX1tEuQLVJmN8cLs=";

     

       19
       19
       -
           aarch64-linux = "sha256-5vAjw2vimjCHKPxjIp5vcwMCWUUDYVlk4QyOeEI0DLY=";

     

       20
       20
       -
           x86_64-darwin = "sha256-o4WRkg4ptiJTNMkorn5K+P8xOJwpChM5PqkZCjP076g=";

     

       21
       21
       -
           aarch64-darwin = "sha256-ZuWBnvxu1PgDtjtguxtj3BhFO01AChlbjAS0kZUws3A=";

     

       7
       7
       +
           x86_64-linux = "sha256-jLYl/CJp2Z+Ut6qZlh6u+CtR8KN+ToNTB+72QnVbIKM=";

     

       8
       8
       +
           aarch64-linux = "sha256-uAkBMg6JXA+aILd8TzDtuaEdM3Axiw43Ad5tZzxNt5w=";

     

       9
       9
       +
           x86_64-darwin = "sha256-60aR0YvQT8KyacY8J3fWKZcf9vny51VUB19NVpurS/A=";

     

       10
       10
       +
           aarch64-darwin = "sha256-pd/I6Mclj2/r/uJTIywnolPKYzeLu1c28d/6D56vkzQ=";

     

       22
       11
        
         };

     

       23
       12
        
       }

+16 -11

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

···

       9
       9
        
         installShellFiles,

     

       10
       10
        
         libiconv,

     

       11
       11
        
         darwin,

     

       12
       12
       -
         librusty_v8 ? callPackage ./librusty_v8.nix { },

     

       12
       12
       +
         librusty_v8 ? callPackage ./librusty_v8.nix {

     

       13
       13
       +
           inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8;

     

       14
       14
       +
         },

     

       13
       15
        
       }:

     

       16
       16
       +
       

     

       17
       17
       +
       let

     

       18
       18
       +
         canExecute = stdenv.buildPlatform.canExecute stdenv.hostPlatform;

     

       19
       19
       +
       in

     

       14
       20
        
       rustPlatform.buildRustPackage rec {

     

       15
       21
        
         pname = "deno";

     

       16
       16
       -
         version = "1.46.3";

     

       22
       22
       +
         version = "2.0.0";

     

       17
       23
        
       

     

       18
       24
        
         src = fetchFromGitHub {

     

       19
       25
        
           owner = "denoland";

     

       20
       26
        
           repo = "deno";

     

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

     

       22
       22
       -
           hash = "sha256-AM6SjcIHo6Koxcnznhkv3cXoKaMy2TEVpiWe/bczDuA=";

     

       28
       28
       +
           hash = "sha256-3PfAjn2zWgxJOYgKwR7lvXu+rIENIHBMPwMM6dWNgR4=";

     

       23
       29
        
         };

     

       24
       30
        
       

     

       25
       25
       -
         cargoHash = "sha256-D+CZpb6OTzM5Il0k8GQB7qSONy4myE5yKlaSkLLqHT8=";

     

       31
       31
       +
         cargoHash = "sha256-3r5B9yWXKO/8ah+Etflws8RnlRTAdaaC5HZMlZduyHE=";

     

       26
       32
        
       

     

       27
       33
        
         postPatch = ''

     

       28
       34
        
           # upstream uses lld on aarch64-darwin for faster builds

     
···

       54
       60
        
           ])

     

       55
       61
        
         );

     

       56
       62
        
       

     

       63
       63
       +
         buildAndTestSubdir = "cli";

     

       64
       64
       +
       

     

       57
       65
        
         # work around "error: unknown warning group '-Wunused-but-set-parameter'"

     

       58
       66
        
         env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unknown-warning-option";

     

       59
       59
       -
       

     

       60
       60
       -
         buildAndTestSubdir = "cli";

     

       61
       61
       -
       

     

       62
       67
        
         # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem

     

       63
       68
        
         # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE

     

       64
       64
       -
         RUSTY_V8_ARCHIVE = librusty_v8;

     

       69
       69
       +
         env.RUSTY_V8_ARCHIVE = librusty_v8;

     

       65
       70
        
       

     

       66
       71
        
         # Tests have some inconsistencies between runs with output integration tests

     

       67
       72
        
         # Skipping until resolved

     
···

       71
       76
        
           find ./target -name libswc_common${stdenv.hostPlatform.extensions.sharedLibrary} -delete

     

       72
       77
        
         '';

     

       73
       78
        
       

     

       74
       74
       -
         postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

     

       79
       79
       +
         postInstall = lib.optionalString (canExecute) ''

     

       75
       80
        
           installShellCompletion --cmd deno \

     

       76
       81
        
             --bash <($out/bin/deno completions bash) \

     

       77
       82
        
             --fish <($out/bin/deno completions fish) \

     

       78
       83
        
             --zsh <($out/bin/deno completions zsh)

     

       79
       84
        
         '';

     

       80
       85
        
       

     

       81
       81
       -
         doInstallCheck = true;

     

       82
       82
       -
         installCheckPhase = ''

     

       86
       86
       +
         doInstallCheck = canExecute;

     

       87
       87
       +
         installCheckPhase = lib.optionalString (canExecute) ''

     

       83
       88
        
           runHook preInstallCheck

     

       84
       89
        
           $out/bin/deno --help

     

       85
       90
        
           $out/bin/deno --version | grep "deno ${version}"

+41 -30

pkgs/by-name/de/deno/tests/default.nix

···

       1
       1
       -
       { deno, runCommand, lib, testers }:

     

       1
       1
       +
       {

     

       2
       2
       +
         deno,

     

       3
       3
       +
         runCommand,

     

       4
       4
       +
         lib,

     

       5
       5
       +
         testers,

     

       6
       6
       +
       }:

     

       2
       7
        
       let

     

       3
       8
        
         testDenoRun =

     

       4
       9
        
           name:

     

       5
       5
       -
           { args ? ""

     

       6
       6
       -
           , dir ? ./. + "/${name}"

     

       7
       7
       -
           , file ? "index.ts"

     

       8
       8
       -
           , expected ? ""

     

       9
       9
       -
           , expectFailure ? false

     

       10
       10
       +
           {

     

       11
       11
       +
             args ? "",

     

       12
       12
       +
             dir ? ./. + "/${name}",

     

       13
       13
       +
             file ? "index.ts",

     

       14
       14
       +
             expected ? "",

     

       15
       15
       +
             expectFailure ? false,

     

       10
       16
        
           }:

     

       11
       17
        
           let

     

       12
       18
        
             command = "deno run ${args} ${dir}/${file}";

     

       13
       19
        
           in

     

       14
       14
       -
           runCommand "deno-test-${name}" { nativeBuildInputs = [ deno ]; meta.timeout = 60; } ''

     

       15
       15
       -
             HOME=$(mktemp -d)

     

       16
       16
       -
             if output=$(${command} 2>&1); then

     

       17
       17
       -
               if [[ $output =~ '${expected}' ]]; then

     

       18
       18
       -
                 echo "Test '${name}' passed"

     

       19
       19
       -
                 touch $out

     

       20
       20
       +
           runCommand "deno-test-${name}"

     

       21
       21
       +
             {

     

       22
       22
       +
               nativeBuildInputs = [ deno ];

     

       23
       23
       +
               meta.timeout = 60;

     

       24
       24
       +
             }

     

       25
       25
       +
             ''

     

       26
       26
       +
               HOME=$(mktemp -d)

     

       27
       27
       +
               if output=$(${command} 2>&1); then

     

       28
       28
       +
                 if [[ $output =~ '${expected}' ]]; then

     

       29
       29
       +
                   echo "Test '${name}' passed"

     

       30
       30
       +
                   touch $out

     

       31
       31
       +
                 else

     

       32
       32
       +
                   echo -n ${lib.escapeShellArg command} >&2

     

       33
       33
       +
                   echo " output did not match what was expected." >&2

     

       34
       34
       +
                   echo "The expected was:" >&2

     

       35
       35
       +
                   echo '${expected}' >&2

     

       36
       36
       +
                   echo "The output was:" >&2

     

       37
       37
       +
                   echo "$output" >&2

     

       38
       38
       +
                   exit 1

     

       39
       39
       +
                 fi

     

       20
       40
        
               else

     

       41
       41
       +
                 if [[ "${toString expectFailure}" == "1" ]]; then

     

       42
       42
       +
                   echo "Test '${name}' failed as expected"

     

       43
       43
       +
                   touch $out

     

       44
       44
       +
                   exit 0

     

       45
       45
       +
                 fi

     

       21
       46
        
                 echo -n ${lib.escapeShellArg command} >&2

     

       22
       22
       -
                 echo " output did not match what was expected." >&2

     

       23
       23
       -
                 echo "The expected was:" >&2

     

       24
       24
       -
                 echo '${expected}' >&2

     

       25
       25
       -
                 echo "The output was:" >&2

     

       47
       47
       +
                 echo " returned a non-zero exit code." >&2

     

       26
       48
        
                 echo "$output" >&2

     

       27
       49
        
                 exit 1

     

       28
       50
        
               fi

     

       29
       29
       -
             else

     

       30
       30
       -
               if [[ "${toString expectFailure}" == "1" ]]; then

     

       31
       31
       -
                 echo "Test '${name}' failed as expected"

     

       32
       32
       -
                 touch $out

     

       33
       33
       -
                 exit 0

     

       34
       34
       -
               fi

     

       35
       35
       -
               echo -n ${lib.escapeShellArg command} >&2

     

       36
       36
       -
               echo " returned a non-zero exit code." >&2

     

       37
       37
       -
               echo "$output" >&2

     

       38
       38
       -
               exit 1

     

       39
       39
       -
             fi

     

       40
       40
       -
           '';

     

       51
       51
       +
             '';

     

       41
       52
        
       in

     

       42
       53
        
       (lib.mapAttrs testDenoRun {

     

       43
       54
        
         basic = {

     
···

       59
       70
        
           expectFailure = true;

     

       60
       71
        
           dir = ./read-file;

     

       61
       72
        
         };

     

       62
       62
       -
       }) //

     

       63
       63
       -
       {

     

       73
       73
       +
       })

     

       74
       74
       +
       // {

     

       64
       75
        
         version = testers.testVersion {

     

       65
       76
        
           package = deno;

     

       66
       77
        
           command = "deno --version";

+1 -1

pkgs/by-name/de/deno/tests/import-json/index.ts

···

       1
       1
       -
       import file from "./data.json" assert { type: "json" };

     

       1
       1
       +
       import file from "./data.json" with { type: "json" };

     

       2
       2
        
       console.log(file.msg);

+5 -9

pkgs/by-name/de/deno/update/common.ts

···

       3
       3
        
       }

     

       4
       4
        
       

     

       5
       5
        
       const decode = (buffer: Uint8Array) => new TextDecoder("utf-8").decode(buffer);

     

       6
       6
       -
       const decodeTrim = (b: Uint8Array) => decode(b).trimEnd();

     

       7
       6
        
       export const run = async (command: string, args: string[]) => {

     

       8
       8
       -
         const cmd = Deno.run({

     

       9
       9
       -
           cmd: [command, ...args],

     

       10
       10
       -
           stdout: "piped",

     

       11
       11
       -
           stderr: "piped",

     

       12
       12
       -
         });

     

       13
       13
       -
         if (!(await cmd.status()).success) {

     

       14
       14
       -
           const error = await cmd.stderrOutput().then(decodeTrim);

     

       7
       7
       +
         const cmd = new Deno.Command(command, { args });

     

       8
       8
       +
         const { code, stdout, stderr } = await cmd.output();

     

       9
       9
       +
         if (code !== 0) {

     

       10
       10
       +
           const error = decode(stderr).trimEnd();

     

       15
       11
        
           // Known error we can ignore

     

       16
       12
        
           if (error.includes("'allow-unsafe-native-code-during-evaluation'")) {

     

       17
       13
        
             // Extract the target sha256 out of the error

     
···

       26
       22
        
           }

     

       27
       23
        
           throw new Error(error);

     

       28
       24
        
         }

     

       29
       29
       -
         return cmd.output().then(decodeTrim);

     

       25
       25
       +
         return decode(stdout).trimEnd();

     

       30
       26
        
       };

     

       31
       27
        
       

     

       32
       28
        
       // Exports

+7 -14

pkgs/by-name/de/deno/update/librusty_v8.ts

···

       1
       1
       -
       import * as toml from "https://deno.land/std@0.202.0/toml/mod.ts";

     

       1
       1
       +
       import * as toml from "jsr:@std/toml@1.0.1";

     

       2
       2
        
       import { getExistingVersion, logger, run, write } from "./common.ts";

     

       3
       3
        
       

     

       4
       4
        
       const log = logger("librusty_v8");

     
···

       40
       40
        
       

     

       41
       41
        
       const templateDeps = (version: string, deps: PrefetchResult[]) =>

     

       42
       42
        
         `# auto-generated file -- DO NOT EDIT!

     

       43
       43
       -
       { lib, stdenv, fetchurl }:

     

       43
       43
       +
       { fetchLibrustyV8 }:

     

       44
       44
        
       

     

       45
       45
       -
       let

     

       46
       46
       -
         fetch_librusty_v8 = args: fetchurl {

     

       47
       47
       -
           name = "librusty_v8-\${args.version}";

     

       48
       48
       -
           url = "https://github.com/denoland/rusty_v8/releases/download/v\${args.version}/librusty_v8_release_\${stdenv.hostPlatform.rust.rustcTarget}.a.gz";

     

       49
       49
       -
           sha256 = args.shas.\${stdenv.hostPlatform.system};

     

       50
       50
       -
           meta = {

     

       51
       51
       -
             inherit (args) version;

     

       52
       52
       -
             sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

     

       53
       53
       -
           };

     

       54
       54
       -
         };

     

       55
       55
       -
       in

     

       56
       56
       -
       fetch_librusty_v8 {

     

       45
       45
       +
       fetchLibrustyV8 {

     

       57
       46
        
         version = "${version}";

     

       58
       47
        
         shas = {

     

       48
       48
       +
           x86_64-linux = "sha256-jLYl/CJp2Z+Ut6qZlh6u+CtR8KN+ToNTB+72QnVbIKM=";

     

       49
       49
       +
           aarch64-linux = "sha256-uAkBMg6JXA+aILd8TzDtuaEdM3Axiw43Ad5tZzxNt5w=";

     

       50
       50
       +
           x86_64-darwin = "sha256-60aR0YvQT8KyacY8J3fWKZcf9vny51VUB19NVpurS/A=";

     

       51
       51
       +
           aarch64-darwin = "sha256-pd/I6Mclj2/r/uJTIywnolPKYzeLu1c28d/6D56vkzQ=";

     

       59
       52
        
       ${deps.map(({ arch, sha256 }) => `    ${arch.nix} = "${sha256}";`).join("\n")}

     

       60
       53
        
         };

     

       61
       54
        
       }

+3 -3

pkgs/by-name/ex/exo/package.nix

···

       6
       6
        
       }:

     

       7
       7
        
       python3Packages.buildPythonApplication {

     

       8
       8
        
         pname = "exo";

     

       9
       9
       -
         version = "0-unstable-2024-10-06";

     

       9
       9
       +
         version = "0-unstable-2024-10-09";

     

       10
       10
        
         pyproject = true;

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "exo-explore";

     

       14
       14
        
           repo = "exo";

     

       15
       15
       -
           rev = "7b2a523fd1e5f1281d89bc1f664a29dc2003b787";

     

       16
       16
       -
           hash = "sha256-o4tNbU9oa7WsAQ6eiTHqQVhliXbG/Y8d7PeH2TTWgGk=";

     

       15
       15
       +
           rev = "c1a26cd7fa447b2802a4bececfd7cb9d316c0600";

     

       16
       16
       +
           hash = "sha256-jtcfGmk03Yf5IaswIvi6N9oMXzNPYlJBf4WMLkogUVo=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         build-system = with python3Packages; [ setuptools ];

+2 -5

pkgs/by-name/li/librewolf-bin/package.nix

···

       6
       6
        
       

     

       7
       7
        
       let

     

       8
       8
        
         pname = "librewolf-bin";

     

       9
       9
       -
         upstreamVersion = "129.0.2-1";

     

       9
       9
       +
         upstreamVersion = "131.0.2-1";

     

       10
       10
        
         version = lib.replaceStrings [ "-" ] [ "." ] upstreamVersion;

     

       11
       11
        
         src = fetchurl {

     

       12
       12
        
           url = "https://gitlab.com/api/v4/projects/24386000/packages/generic/librewolf/${upstreamVersion}/LibreWolf.x86_64.AppImage";

     

       13
       13
       -
           hash = "sha256-h4SZnI2BwCSsLADYIxTXu82Jyst1hqYGHt54MnluLss=";

     

       13
       13
       +
           hash = "sha256-Sj3WkY3t8UHsh2v3xPaDb0IGp66YQIw9MKmmFFQCGvk=";

     

       14
       14
        
         };

     

       15
       15
        
         appimageContents = appimageTools.extract { inherit pname version src; };

     

       16
       16
        
       in

     
···

       31
       31
        
           platforms = [ "x86_64-linux" ];

     

       32
       32
        
           mainProgram = "librewolf";

     

       33
       33
        
           sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

     

       34
       34
       -
           knownVulnerabilities = [

     

       35
       35
       -
             "CVE-2024-9680"

     

       36
       36
       -
           ];

     

       37
       34
        
         };

     

       38
       35
        
       }

+2 -2

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

···

       23
       23
        
       

     

       24
       24
        
       stdenv.mkDerivation rec {

     

       25
       25
        
         pname = "mold";

     

       26
       26
       -
         version = "2.34.0";

     

       26
       26
       +
         version = "2.34.1";

     

       27
       27
        
       

     

       28
       28
        
         src = fetchFromGitHub {

     

       29
       29
        
           owner = "rui314";

     

       30
       30
        
           repo = "mold";

     

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

     

       32
       32
       -
           hash = "sha256-QH9mtigVqt9ZrVBUyQcgUMW/8jtXHSYDWz6pprt6Hlk=";

     

       32
       32
       +
           hash = "sha256-x5fQ+dJFcxwENyTpZpQsMqTLtYQ8uuhUHV8jDpmltWg=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         nativeBuildInputs = [

+2 -2

pkgs/by-name/mu/music-assistant/package.nix

···

       24
       24
        
       

     

       25
       25
        
       python.pkgs.buildPythonApplication rec {

     

       26
       26
        
         pname = "music-assistant";

     

       27
       27
       -
         version = "2.2.6";

     

       27
       27
       +
         version = "2.2.7";

     

       28
       28
        
         pyproject = true;

     

       29
       29
        
       

     

       30
       30
        
         src = fetchFromGitHub {

     

       31
       31
        
           owner = "music-assistant";

     

       32
       32
        
           repo = "server";

     

       33
       33
        
           rev = "refs/tags/${version}";

     

       34
       34
       -
           hash = "sha256-BEbcIq+qtJ1OffT2we6qajzvDYDu09rMcmJF1F06xZQ=";

     

       34
       34
       +
           hash = "sha256-GMjeNX8C027F+Wl/HfluWap9pDOeQwlM9qOs0Sp5tTI=";

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         patches = [

+13

pkgs/by-name/te/terraform-docs/package.nix

···

       1
       1
        
       {

     

       2
       2
       +
         stdenv,

     

       2
       3
        
         lib,

     

       3
       4
        
         buildGoModule,

     

       4
       5
        
         fetchFromGitHub,

     

       6
       6
       +
         installShellFiles,

     

       5
       7
        
       }:

     

       6
       8
        
       buildGoModule rec {

     

       7
       9
        
         pname = "terraform-docs";

     
···

       15
       17
        
         };

     

       16
       18
        
       

     

       17
       19
        
         vendorHash = "sha256-aweKTHQBYYqSp8CymwhnVv1WNQ7cZ1/bJNz7DSo7PKc=";

     

       20
       20
       +
       

     

       21
       21
       +
         excludedPackages = [ "scripts" ];

     

       22
       22
       +
       

     

       23
       23
       +
         nativeBuildInputs = [ installShellFiles ];

     

       24
       24
       +
       

     

       25
       25
       +
         postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

     

       26
       26
       +
           $out/bin/terraform-docs completion bash >terraform-docs.bash

     

       27
       27
       +
           $out/bin/terraform-docs completion fish >terraform-docs.fish

     

       28
       28
       +
           $out/bin/terraform-docs completion zsh >terraform-docs.zsh

     

       29
       29
       +
           installShellCompletion terraform-docs.{bash,fish,zsh}

     

       30
       30
       +
         '';

     

       18
       31
        
       

     

       19
       32
        
         meta = with lib; {

     

       20
       33
        
           description = "Utility to generate documentation from Terraform modules in various output formats";

+11 -11

pkgs/by-name/tt/ttop/lock.json

···

       10
       10
        
             "rev": "9f51fc4e94d0960ab63fa6ea274518159720aa69",

     

       11
       11
        
             "sha256": "1n8cx5vl26ppjsn889zmfpa37yhlxahy2va4bqp6q4v4r1dl1h14",

     

       12
       12
        
             "srcDir": "src",

     

       13
       13
       -
             "url": "https://github.com/Yardanico/asciigraph/archive/9f51fc4e94d0960ab63fa6ea274518159720aa69.tar.gz"

     

       13
       13
       +
             "url": "https://github.com/nimbackup/asciigraph/archive/9f51fc4e94d0960ab63fa6ea274518159720aa69.tar.gz"

     

       14
       14
        
           },

     

       15
       15
        
           {

     

       16
       16
        
             "method": "fetchzip",

     

       17
       17
        
             "packages": [

     

       18
       18
        
               "illwill"

     

       19
       19
        
             ],

     

       20
       20
       -
             "path": "/nix/store/3lmm3z36qn4gz7bfa209zv0pqrpm3di9-source",

     

       21
       21
       -
             "ref": "v0.3.2",

     

       22
       22
       -
             "rev": "1d12cb36ab7b76c31d2d25fa421013ecb382e625",

     

       23
       23
       -
             "sha256": "0f9yncl5gbdja18mrqf5ixrdgrh95k0khda923dm1jd1x1b7ar8z",

     

       20
       20
       +
             "path": "/nix/store/k3sxzm7qnkgnwkrfd8hc3gkwzbayb1h1-source",

     

       21
       21
       +
             "ref": "v0.4.1",

     

       22
       22
       +
             "rev": "2736d9e0eb6b2bf32cd2fdb8226407a388362cd1",

     

       23
       23
       +
             "sha256": "0hiic5yjsaw6sgl1jzmfpm5g6a5ckzmd29c3pzg30glchn2g94sk",

     

       24
       24
        
             "srcDir": "",

     

       25
       25
       -
             "url": "https://github.com/johnnovak/illwill/archive/1d12cb36ab7b76c31d2d25fa421013ecb382e625.tar.gz"

     

       25
       25
       +
             "url": "https://github.com/johnnovak/illwill/archive/99a120f7f69868b94f5d35ce7e21dd12535de70c.tar.gz"

     

       26
       26
        
           },

     

       27
       27
        
           {

     

       28
       28
        
             "method": "fetchzip",

     
···

       52
       52
        
             "packages": [

     

       53
       53
        
               "zippy"

     

       54
       54
        
             ],

     

       55
       55
       -
             "path": "/nix/store/dj520pi1q9xh5gplcjs0jsn5wgnaa0cr-source",

     

       56
       56
       -
             "ref": "0.10.11",

     

       57
       57
       -
             "rev": "9560f3d20479fb390c97f731ef8d100f1ed54e6c",

     

       58
       58
       -
             "sha256": "140r42kgynwsnrga4x2mildx9pflwniyhjjzmid2jvnl4i6jrsr4",

     

       55
       55
       +
             "path": "/nix/store/zcd2hmjxlkp1bpb7c9xrpg153ssj3w0b-source",

     

       56
       56
       +
             "ref": "0.10.16",

     

       57
       57
       +
             "rev": "a99f6a7d8a8e3e0213b3cad0daf0ea974bf58e3f",

     

       58
       58
       +
             "sha256": "16qdnyql8d7nm7nwwpq0maflm3p6cpbb2jfaqx6xkld9xkc9lsbv",

     

       59
       59
        
             "srcDir": "src",

     

       60
       60
       -
             "url": "https://github.com/guzba/zippy/archive/9560f3d20479fb390c97f731ef8d100f1ed54e6c.tar.gz"

     

       60
       60
       +
             "url": "https://github.com/guzba/zippy/archive/a99f6a7d8a8e3e0213b3cad0daf0ea974bf58e3f.tar.gz"

     

       61
       61
        
           }

     

       62
       62
        
         ]

     

       63
       63
        
       }

+2 -2

pkgs/by-name/tt/ttop/package.nix

···

       2
       2
        
       

     

       3
       3
        
       buildNimPackage (finalAttrs: {

     

       4
       4
        
         pname = "ttop";

     

       5
       5
       -
         version = "1.2.8";

     

       5
       5
       +
         version = "1.5.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "inv2004";

     

       9
       9
        
           repo = "ttop";

     

       10
       10
        
           rev = "v${finalAttrs.version}";

     

       11
       11
       -
           hash = "sha256-QMUrA3OjxlDa1OxptJL7T3SPDTzSwVz6zz+ueh9eovM=";

     

       11
       11
       +
           hash = "sha256-/rs5JjTXxptVHXL3fY8qP6Be3r5N871CEbUH7w6zx4A=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         lockFile = ./lock.json;

+1 -1

pkgs/by-name/ze/zed-editor/Cargo.lock

···

       14398
       14398
        
       

     

       14399
       14399
        
       [[package]]

     

       14400
       14400
        
       name = "zed"

     

       14401
       14401
       -
       version = "0.156.0"

     

       14401
       14401
       +
       version = "0.156.1"

     

       14402
       14402
        
       dependencies = [

     

       14403
       14403
        
        "activity_indicator",

     

       14404
       14404
        
        "anyhow",

+2 -2

pkgs/by-name/ze/zed-editor/package.nix

···

       86
       86
        
       in

     

       87
       87
        
       rustPlatform.buildRustPackage rec {

     

       88
       88
        
         pname = "zed-editor";

     

       89
       89
       -
         version = "0.156.0";

     

       89
       89
       +
         version = "0.156.1";

     

       90
       90
        
       

     

       91
       91
        
         src = fetchFromGitHub {

     

       92
       92
        
           owner = "zed-industries";

     

       93
       93
        
           repo = "zed";

     

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

     

       95
       95
       -
           hash = "sha256-HdiEVRssMJmn+ifa0oWhHzRXB9L4oyji0DZ3PopHSoY=";

     

       95
       95
       +
           hash = "sha256-cu+XcFJ6VAP+7fqVhptnjDNpRkq/lRmJBCNkiy5Mka8=";

     

       96
       96
        
           fetchSubmodules = true;

     

       97
       97
        
         };

     

       98
       98

+31

pkgs/development/compilers/llvm/19/libclc/use-default-paths.patch

···

       1
       1
       +
       From e8b910246d0c7c3d9fff994f71c6f8a48ec09a50 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Tristan Ross <tristan.ross@midstall.com>

     

       3
       3
       +
       Date: Sat, 24 Aug 2024 19:56:24 -0700

     

       4
       4
       +
       Subject: [PATCH] [libclc] use default paths with find_program when possible

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        libclc/CMakeLists.txt | 4 ++--

     

       8
       8
       +
        1 file changed, 2 insertions(+), 2 deletions(-)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       11
       11
       +
       index 02bb859ae8590b..6bcd8ae52a5794 100644

     

       12
       12
       +
       --- a/CMakeLists.txt

     

       13
       13
       +
       +++ b/CMakeLists.txt

     

       14
       14
       +
       @@ -55,7 +55,7 @@ if( LIBCLC_STANDALONE_BUILD OR CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DI

     

       15
       15
       +
          # Import required tools

     

       16
       16
       +
          if( NOT EXISTS ${LIBCLC_CUSTOM_LLVM_TOOLS_BINARY_DIR} )

     

       17
       17
       +
            foreach( tool IN ITEMS clang llvm-as llvm-link opt )

     

       18
       18
       +
       -      find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )

     

       19
       19
       +
       +      find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} )

     

       20
       20
       +
              set( ${tool}_exe ${LLVM_TOOL_${tool}} )

     

       21
       21
       +
              set( ${tool}_target )

     

       22
       22
       +
            endforeach()

     

       23
       23
       +
       @@ -104,7 +104,7 @@ foreach( tool IN ITEMS clang opt llvm-as llvm-link )

     

       24
       24
       +
        endforeach()

     

       25
       25
       +
        

     

       26
       26
       +
        # llvm-spirv is an optional dependency, used to build spirv-* targets.

     

       27
       27
       +
       -find_program( LLVM_SPIRV llvm-spirv PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )

     

       28
       28
       +
       +find_program( LLVM_SPIRV llvm-spirv PATHS ${LLVM_TOOLS_BINARY_DIR} )

     

       29
       29
       +
        

     

       30
       30
       +
        if( LLVM_SPIRV )

     

       31
       31
       +
          add_executable( libclc::llvm-spirv IMPORTED GLOBAL )

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

···

       294
       294
        
                         path = ../14;

     

       295
       295
        
                       }

     

       296
       296
        
                     ];

     

       297
       297
       +
                     "libclc/use-default-paths.patch" = [

     

       298
       298
       +
                       {

     

       299
       299
       +
                         after = "19";

     

       300
       300
       +
                         path = ../19;

     

       301
       301
       +
                       }

     

       302
       302
       +
                     ];

     

       297
       303
        
                   };

     

       298
       304
        
       

     

       299
       305
        
                   constraints = patches."${p}" or null;

+63 -24

pkgs/development/compilers/llvm/common/libclc.nix

···

       1
       1
       -
       { lib, stdenv, version, runCommand, monorepoSrc, llvm, buildPackages, buildLlvmTools, ninja, cmake, python3 }:

     

       2
       2
       -
       

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         version,

     

       5
       5
       +
         runCommand,

     

       6
       6
       +
         monorepoSrc,

     

       7
       7
       +
         llvm,

     

       8
       8
       +
         buildPackages,

     

       9
       9
       +
         buildLlvmTools,

     

       10
       10
       +
         ninja,

     

       11
       11
       +
         cmake,

     

       12
       12
       +
         python3,

     

       13
       13
       +
         release_version,

     

       14
       14
       +
         getVersionFile,

     

       15
       15
       +
       }:

     

       16
       16
       +
       let

     

       17
       17
       +
         spirv-llvm-translator = buildPackages.spirv-llvm-translator.override {

     

       18
       18
       +
           inherit (buildLlvmTools) llvm;

     

       19
       19
       +
         };

     

       20
       20
       +
       in

     

       3
       21
        
       stdenv.mkDerivation rec {

     

       4
       22
        
         pname = "libclc";

     

       5
       23
        
         inherit version;

     

       6
       24
        
       

     

       7
       7
       -
         src = runCommand "${pname}-src-${version}" {} ''

     

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

     

       8
       26
        
           mkdir -p "$out"

     

       9
       27
        
           cp -r ${monorepoSrc}/cmake "$out"

     

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

     
···

       12
       30
        
       

     

       13
       31
        
         sourceRoot = "${src.name}/${pname}";

     

       14
       32
        
       

     

       15
       15
       -
         outputs = [ "out" "dev" ];

     

       16
       16
       -
       

     

       17
       17
       -
         patches = [

     

       18
       18
       -
           ./libclc/libclc-gnu-install-dirs.patch

     

       33
       33
       +
         outputs = [

     

       34
       34
       +
           "out"

     

       35
       35
       +
           "dev"

     

       19
       36
        
         ];

     

       20
       37
        
       

     

       38
       38
       +
         patches =

     

       39
       39
       +
           [ ./libclc/libclc-gnu-install-dirs.patch ]

     

       40
       40
       +
           # LLVM 19 changes how host tools are looked up.

     

       41
       41
       +
           # Need to remove NO_DEFAULT_PATH and the PATHS arguments for find_program

     

       42
       42
       +
           # so CMake can actually find the tools in nativeBuildInputs.

     

       43
       43
       +
           # https://github.com/llvm/llvm-project/pull/105969

     

       44
       44
       +
           ++ lib.optional (lib.versionAtLeast release_version "19") (

     

       45
       45
       +
             getVersionFile "libclc/use-default-paths.patch"

     

       46
       46
       +
           );

     

       47
       47
       +
       

     

       21
       48
        
         # cmake expects all required binaries to be in the same place, so it will not be able to find clang without the patch

     

       22
       22
       -
         postPatch = ''

     

       23
       23
       -
           substituteInPlace CMakeLists.txt \

     

       24
       24
       -
             --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \

     

       25
       25
       -
                       'find_program( LLVM_CLANG clang PATHS "${buildLlvmTools.clang.cc}/bin" NO_DEFAULT_PATH )' \

     

       26
       26
       -
             --replace 'find_program( LLVM_AS llvm-as PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \

     

       27
       27
       -
                       'find_program( LLVM_AS llvm-as PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \

     

       28
       28
       -
             --replace 'find_program( LLVM_LINK llvm-link PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \

     

       29
       29
       -
                       'find_program( LLVM_LINK llvm-link PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \

     

       30
       30
       -
             --replace 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \

     

       31
       31
       -
                       'find_program( LLVM_OPT opt PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \

     

       32
       32
       -
             --replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \

     

       33
       33
       -
                       'find_program( LLVM_SPIRV llvm-spirv PATHS "${buildPackages.spirv-llvm-translator.override { inherit (buildLlvmTools) llvm; }}/bin" NO_DEFAULT_PATH )'

     

       34
       34
       -
         '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''

     

       35
       35
       -
           substituteInPlace CMakeLists.txt \

     

       36
       36
       -
             --replace 'COMMAND prepare_builtins' 'COMMAND ${buildLlvmTools.libclc.dev}/bin/prepare_builtins'

     

       37
       37
       -
         '';

     

       49
       49
       +
         postPatch =

     

       50
       50
       +
           lib.optionalString (lib.versionOlder release_version "19") ''

     

       51
       51
       +
             substituteInPlace CMakeLists.txt \

     

       52
       52
       +
               --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \

     

       53
       53
       +
                         'find_program( LLVM_CLANG clang PATHS "${buildLlvmTools.clang.cc}/bin" NO_DEFAULT_PATH )' \

     

       54
       54
       +
               --replace 'find_program( LLVM_AS llvm-as PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \

     

       55
       55
       +
                         'find_program( LLVM_AS llvm-as PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \

     

       56
       56
       +
               --replace 'find_program( LLVM_LINK llvm-link PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \

     

       57
       57
       +
                         'find_program( LLVM_LINK llvm-link PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \

     

       58
       58
       +
               --replace 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \

     

       59
       59
       +
                         'find_program( LLVM_OPT opt PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \

     

       60
       60
       +
               --replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \

     

       61
       61
       +
                         'find_program( LLVM_SPIRV llvm-spirv PATHS "${spirv-llvm-translator}/bin" NO_DEFAULT_PATH )'

     

       62
       62
       +
           ''

     

       63
       63
       +
           + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''

     

       64
       64
       +
             substituteInPlace CMakeLists.txt \

     

       65
       65
       +
               --replace 'COMMAND prepare_builtins' 'COMMAND ${buildLlvmTools.libclc.dev}/bin/prepare_builtins'

     

       66
       66
       +
           '';

     

       38
       67
        
       

     

       39
       39
       -
         nativeBuildInputs = [ cmake ninja python3 ];

     

       68
       68
       +
         nativeBuildInputs =

     

       69
       69
       +
           [

     

       70
       70
       +
             cmake

     

       71
       71
       +
             ninja

     

       72
       72
       +
             python3

     

       73
       73
       +
           ]

     

       74
       74
       +
           ++ lib.optional (lib.versionAtLeast release_version "19") [

     

       75
       75
       +
             buildLlvmTools.clang.cc

     

       76
       76
       +
             buildLlvmTools.llvm

     

       77
       77
       +
             spirv-llvm-translator

     

       78
       78
       +
           ];

     

       40
       79
        
         buildInputs = [ llvm ];

     

       41
       80
        
         strictDeps = true;

     

       42
       81

+122 -85

pkgs/development/compilers/spirv-llvm-translator/default.nix

···

       1
       1
       -
       { lib, stdenv

     

       2
       2
       -
       , fetchFromGitHub

     

       3
       3
       -
       , fetchpatch

     

       4
       4
       -
       , cmake

     

       5
       5
       -
       , pkg-config

     

       6
       6
       -
       , lit

     

       7
       7
       -
       , llvm

     

       8
       8
       -
       , spirv-headers

     

       9
       9
       -
       , spirv-tools

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         fetchpatch,

     

       6
       6
       +
         cmake,

     

       7
       7
       +
         pkg-config,

     

       8
       8
       +
         lit,

     

       9
       9
       +
         llvm,

     

       10
       10
       +
         spirv-headers,

     

       11
       11
       +
         spirv-tools,

     

       10
       12
        
       }:

     

       11
       13
        
       

     

       12
       14
        
       let

     
···

       15
       17
        
       

     

       16
       18
        
         # ROCm, if actively updated will always be at the latest version

     

       17
       19
        
         branch =

     

       18
       18
       -
           if llvmMajor == "18" then rec {

     

       19
       19
       -
             version = "18.1.0";

     

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

     

       21
       21
       -
             hash = "sha256-64guZiuO7VpaX01wNIjV7cnjEAe6ineMdY44S6sA33k=";

     

       22
       22
       -
           } else if llvmMajor == "17" || isROCm then rec {

     

       23
       23
       -
             version = "17.0.0";

     

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

     

       25
       25
       -
             hash = "sha256-Rzm5Py9IPFtS9G7kME+uSwZ/0gPGW6MlL35ZWk4LfHM=";

     

       26
       26
       -
           } else if llvmMajor == "16" then rec {

     

       27
       27
       -
             version = "16.0.0";

     

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

     

       29
       29
       -
             hash = "sha256-EUabcYqSjXshbPmcs1DRLvCSL1nd9rEdpqELBrItCW8=";

     

       30
       30
       -
           } else if llvmMajor == "15" then rec {

     

       31
       31
       -
             version = "15.0.0";

     

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

     

       33
       33
       -
             hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI=";

     

       34
       34
       -
           } else if llvmMajor == "14" then {

     

       35
       35
       -
             version = "14.0.0+unstable-2024-07-15";

     

       36
       36
       -
             rev = "2823e7052b7999c10fff63bc8089e5aa205716f4";

     

       37
       37
       -
             hash = "sha256-8/4B74hYge6WiH7PzRGEgE3W7f9IkQ4VMmfkWKYA/l4=";

     

       38
       38
       -
           } else if llvmMajor == "11" then {

     

       39
       39
       -
             version = "11.0.0+unstable-2022-05-04";

     

       40
       40
       -
             rev = "4ef524240833abfeee1c5b9fff6b1bd53f4806b3"; # 267 commits ahead of v11.0.0

     

       41
       41
       -
             hash = "sha256-NoIoa20+2sH41rEnr8lsMhtfesrtdPINiXtUnxYVm8s=";

     

       42
       42
       -
           } else throw "Incompatible LLVM version.";

     

       20
       20
       +
           if llvmMajor == "19" then

     

       21
       21
       +
             rec {

     

       22
       22
       +
               version = "19.1.0";

     

       23
       23
       +
               rev = "dad1f0eaab8047a4f73c50ed5f3d1694b78aae97";

     

       24
       24
       +
               hash = "sha256-mUvDF5y+cBnqUaHjyiiE8cJGH5MfQMqGFy6bYv9vCVY=";

     

       25
       25
       +
             }

     

       26
       26
       +
           else if llvmMajor == "18" then

     

       27
       27
       +
             rec {

     

       28
       28
       +
               version = "18.1.0";

     

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

     

       30
       30
       +
               hash = "sha256-64guZiuO7VpaX01wNIjV7cnjEAe6ineMdY44S6sA33k=";

     

       31
       31
       +
             }

     

       32
       32
       +
           else if llvmMajor == "17" || isROCm then

     

       33
       33
       +
             rec {

     

       34
       34
       +
               version = "17.0.0";

     

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

     

       36
       36
       +
               hash = "sha256-Rzm5Py9IPFtS9G7kME+uSwZ/0gPGW6MlL35ZWk4LfHM=";

     

       37
       37
       +
             }

     

       38
       38
       +
           else if llvmMajor == "16" then

     

       39
       39
       +
             rec {

     

       40
       40
       +
               version = "16.0.0";

     

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

     

       42
       42
       +
               hash = "sha256-EUabcYqSjXshbPmcs1DRLvCSL1nd9rEdpqELBrItCW8=";

     

       43
       43
       +
             }

     

       44
       44
       +
           else if llvmMajor == "15" then

     

       45
       45
       +
             rec {

     

       46
       46
       +
               version = "15.0.0";

     

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

     

       48
       48
       +
               hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI=";

     

       49
       49
       +
             }

     

       50
       50
       +
           else if llvmMajor == "14" then

     

       51
       51
       +
             {

     

       52
       52
       +
               version = "14.0.0+unstable-2024-07-15";

     

       53
       53
       +
               rev = "2823e7052b7999c10fff63bc8089e5aa205716f4";

     

       54
       54
       +
               hash = "sha256-8/4B74hYge6WiH7PzRGEgE3W7f9IkQ4VMmfkWKYA/l4=";

     

       55
       55
       +
             }

     

       56
       56
       +
           else if llvmMajor == "11" then

     

       57
       57
       +
             {

     

       58
       58
       +
               version = "11.0.0+unstable-2022-05-04";

     

       59
       59
       +
               rev = "4ef524240833abfeee1c5b9fff6b1bd53f4806b3"; # 267 commits ahead of v11.0.0

     

       60
       60
       +
               hash = "sha256-NoIoa20+2sH41rEnr8lsMhtfesrtdPINiXtUnxYVm8s=";

     

       61
       61
       +
             }

     

       62
       62
       +
           else

     

       63
       63
       +
             throw "Incompatible LLVM version.";

     

       43
       64
        
       in

     

       44
       65
        
       stdenv.mkDerivation {

     

       45
       66
        
         pname = "SPIRV-LLVM-Translator";

     
···

       51
       72
        
           inherit (branch) rev hash;

     

       52
       73
        
         };

     

       53
       74
        
       

     

       54
       54
       -
         patches = lib.optionals (llvmMajor == "18") [

     

       55
       55
       -
           # Fixes build after SPV_INTEL_maximum_registers breaking change

     

       56
       56
       -
           # TODO: remove on next spirv-headers release

     

       57
       57
       -
           (fetchpatch {

     

       58
       58
       -
             url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/d970c9126c033ebcbb7187bc705eae2e54726b74.patch";

     

       59
       59
       -
             revert = true;

     

       60
       60
       -
             hash = "sha256-71sJuGqVjTcB549eIiCO0LoqAgxkdEHCoxh8Pd/Qzz8=";

     

       61
       61
       -
           })

     

       62
       62
       -
         ] ++ lib.optionals (lib.versionAtLeast llvmMajor "15" && lib.versionOlder llvmMajor "18") [

     

       63
       63
       -
           # Fixes build after spirv-headers breaking change

     

       64
       64
       -
           (fetchpatch {

     

       65
       65
       -
             url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/0166a0fb86dc6c0e8903436bbc3a89bc3273ebc0.patch";

     

       66
       66
       -
             excludes = ["spirv-headers-tag.conf"];

     

       67
       67
       -
             hash = "sha256-17JJG8eCFVphElY5fVT/79hj0bByWxo8mVp1ZNjQk/M=";

     

       68
       68
       -
           })

     

       69
       69
       -
         ] ++ lib.optionals (llvmMajor == "16") [

     

       70
       70
       -
           # Fixes builds that link against external LLVM dynamic library

     

       71
       71
       -
           (fetchpatch {

     

       72
       72
       -
             url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/f3b9b604d7eda18d0d1029d94a6eebd33aa3a3fe.patch";

     

       73
       73
       -
             hash = "sha256-opDjyZcy7O4wcSfm/A51NCIiDyIvbcmbv9ns1njdJbc=";

     

       74
       74
       -
           })

     

       75
       75
       -
         ] ++ lib.optionals (llvmMajor == "14") [

     

       76
       76
       -
           (fetchpatch {

     

       77
       77
       -
             # tries to install llvm-spirv into llvm nix store path

     

       78
       78
       -
             url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/cce9a2f130070d799000cac42fe24789d2b777ab.patch";

     

       79
       79
       -
             revert = true;

     

       80
       80
       -
             hash = "sha256-GbFacttZRDCgA0jkUoFA4/B3EDn3etweKvM09OwICJ8=";

     

       81
       81
       -
           })

     

       82
       82
       -
         ];

     

       75
       75
       +
         patches =

     

       76
       76
       +
           lib.optionals (llvmMajor == "18") [

     

       77
       77
       +
             # Fixes build after SPV_INTEL_maximum_registers breaking change

     

       78
       78
       +
             # TODO: remove on next spirv-headers release

     

       79
       79
       +
             (fetchpatch {

     

       80
       80
       +
               url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/d970c9126c033ebcbb7187bc705eae2e54726b74.patch";

     

       81
       81
       +
               revert = true;

     

       82
       82
       +
               hash = "sha256-71sJuGqVjTcB549eIiCO0LoqAgxkdEHCoxh8Pd/Qzz8=";

     

       83
       83
       +
             })

     

       84
       84
       +
           ]

     

       85
       85
       +
           ++ lib.optionals (lib.versionAtLeast llvmMajor "15" && lib.versionOlder llvmMajor "18") [

     

       86
       86
       +
             # Fixes build after spirv-headers breaking change

     

       87
       87
       +
             (fetchpatch {

     

       88
       88
       +
               url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/0166a0fb86dc6c0e8903436bbc3a89bc3273ebc0.patch";

     

       89
       89
       +
               excludes = [ "spirv-headers-tag.conf" ];

     

       90
       90
       +
               hash = "sha256-17JJG8eCFVphElY5fVT/79hj0bByWxo8mVp1ZNjQk/M=";

     

       91
       91
       +
             })

     

       92
       92
       +
           ]

     

       93
       93
       +
           ++ lib.optionals (llvmMajor == "16") [

     

       94
       94
       +
             # Fixes builds that link against external LLVM dynamic library

     

       95
       95
       +
             (fetchpatch {

     

       96
       96
       +
               url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/f3b9b604d7eda18d0d1029d94a6eebd33aa3a3fe.patch";

     

       97
       97
       +
               hash = "sha256-opDjyZcy7O4wcSfm/A51NCIiDyIvbcmbv9ns1njdJbc=";

     

       98
       98
       +
             })

     

       99
       99
       +
           ]

     

       100
       100
       +
           ++ lib.optionals (llvmMajor == "14") [

     

       101
       101
       +
             (fetchpatch {

     

       102
       102
       +
               # tries to install llvm-spirv into llvm nix store path

     

       103
       103
       +
               url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/cce9a2f130070d799000cac42fe24789d2b777ab.patch";

     

       104
       104
       +
               revert = true;

     

       105
       105
       +
               hash = "sha256-GbFacttZRDCgA0jkUoFA4/B3EDn3etweKvM09OwICJ8=";

     

       106
       106
       +
             })

     

       107
       107
       +
           ];

     

       83
       108
        
       

     

       84
       84
       -
         nativeBuildInputs = [ pkg-config cmake ]

     

       85
       85
       -
           ++ (if isROCm then [ llvm ] else [ llvm.dev ]);

     

       109
       109
       +
         nativeBuildInputs = [

     

       110
       110
       +
           pkg-config

     

       111
       111
       +
           cmake

     

       112
       112
       +
         ] ++ (if isROCm then [ llvm ] else [ llvm.dev ]);

     

       86
       113
        
       

     

       87
       87
       -
         buildInputs = [ spirv-headers spirv-tools ]

     

       88
       88
       -
           ++ lib.optionals (!isROCm) [ llvm ];

     

       114
       114
       +
         buildInputs = [

     

       115
       115
       +
           spirv-headers

     

       116
       116
       +
           spirv-tools

     

       117
       117
       +
         ] ++ lib.optionals (!isROCm) [ llvm ];

     

       89
       118
        
       

     

       90
       119
        
         nativeCheckInputs = [ lit ];

     

       91
       120
        
       

     

       92
       92
       -
         cmakeFlags = [

     

       93
       93
       -
           "-DLLVM_INCLUDE_TESTS=ON"

     

       94
       94
       -
           "-DLLVM_DIR=${(if isROCm then llvm else llvm.dev)}"

     

       95
       95
       -
           "-DBUILD_SHARED_LIBS=YES"

     

       96
       96
       -
           "-DLLVM_SPIRV_BUILD_EXTERNAL=YES"

     

       97
       97
       -
           # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/

     

       98
       98
       -
           "-DCMAKE_SKIP_BUILD_RPATH=ON"

     

       99
       99
       -
         ] ++ lib.optional (llvmMajor != "11") "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}";

     

       121
       121
       +
         cmakeFlags =

     

       122
       122
       +
           [

     

       123
       123
       +
             "-DLLVM_INCLUDE_TESTS=ON"

     

       124
       124
       +
             "-DLLVM_DIR=${(if isROCm then llvm else llvm.dev)}"

     

       125
       125
       +
             "-DBUILD_SHARED_LIBS=YES"

     

       126
       126
       +
             "-DLLVM_SPIRV_BUILD_EXTERNAL=YES"

     

       127
       127
       +
             # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/

     

       128
       128
       +
             "-DCMAKE_SKIP_BUILD_RPATH=ON"

     

       129
       129
       +
           ]

     

       130
       130
       +
           ++ lib.optional (llvmMajor != "11") "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}"

     

       131
       131
       +
           ++ lib.optional (llvmMajor == "19") "-DBASE_LLVM_VERSION=${lib.versions.majorMinor llvm.version}.0";

     

       100
       132
        
       

     

       101
       133
        
         # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist

     

       102
       134
        
         doCheck = false;

     

       103
       135
        
       

     

       104
       104
       -
         makeFlags = [ "all" "llvm-spirv" ];

     

       136
       136
       +
         makeFlags = [

     

       137
       137
       +
           "all"

     

       138
       138
       +
           "llvm-spirv"

     

       139
       139
       +
         ];

     

       105
       140
        
       

     

       106
       106
       -
         postInstall = ''

     

       107
       107
       -
           install -D tools/llvm-spirv/llvm-spirv $out/bin/llvm-spirv

     

       108
       108
       -
         '' + lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       109
       109
       -
           install_name_tool $out/bin/llvm-spirv \

     

       110
       110
       -
             -change @rpath/libLLVMSPIRVLib.dylib $out/lib/libLLVMSPIRVLib.dylib

     

       111
       111
       -
         '';

     

       141
       141
       +
         postInstall =

     

       142
       142
       +
           ''

     

       143
       143
       +
             install -D tools/llvm-spirv/llvm-spirv $out/bin/llvm-spirv

     

       144
       144
       +
           ''

     

       145
       145
       +
           + lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       146
       146
       +
             install_name_tool $out/bin/llvm-spirv \

     

       147
       147
       +
               -change @rpath/libLLVMSPIRVLib.dylib $out/lib/libLLVMSPIRVLib.dylib

     

       148
       148
       +
           '';

     

       112
       149
        
       

     

       113
       150
        
         meta = with lib; {

     

       114
       114
       -
           homepage    = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator";

     

       151
       151
       +
           homepage = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator";

     

       115
       152
        
           description = "Tool and a library for bi-directional translation between SPIR-V and LLVM IR";

     

       116
       153
        
           mainProgram = "llvm-spirv";

     

       117
       117
       -
           license     = licenses.ncsa;

     

       118
       118
       -
           platforms   = platforms.unix;

     

       154
       154
       +
           license = licenses.ncsa;

     

       155
       155
       +
           platforms = platforms.unix;

     

       119
       156
        
           maintainers = with maintainers; [ gloaming ];

     

       120
       157
        
         };

     

       121
       158
        
       }

+2 -2

pkgs/development/libraries/level-zero/default.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "level-zero";

     

       12
       12
       -
         version = "1.17.42";

     

       12
       12
       +
         version = "1.17.45";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "oneapi-src";

     

       16
       16
        
           repo = "level-zero";

     

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

     

       18
       18
       -
           hash = "sha256-IjYRzjC7CUPDdVBVoWSZtUQaY7QtSfS/Nej/2BdVziY=";

     

       18
       18
       +
           hash = "sha256-2uWZsy8aIV/ToDVuVxpyXoI1GbwZ9IxeLh+1hgjlfEM=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ cmake addDriverRunpath ];

+2 -2

pkgs/development/python-modules/beancount-black/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "beancount-black";

     

       14
       14
       -
         version = "1.0.4";

     

       14
       14
       +
         version = "1.0.5";

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.9";

     

       17
       17
        
         format = "pyproject";

     
···

       20
       20
        
           owner = "LaunchPlatform";

     

       21
       21
        
           repo = "beancount-black";

     

       22
       22
        
           rev = "refs/tags/${version}";

     

       23
       23
       -
           hash = "sha256-GrdQCxVsAzCusxxfQHF48doWG8OVrqBayCFof9RHTkE=";

     

       23
       23
       +
           hash = "sha256-vo11mlgDhyc8YFnULJ4AFrANWmGpAMNX5jJ6QaUNqk0=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         buildInputs = [ poetry-core ];

+3 -3

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

···

       21
       21
        
       

     

       22
       22
        
       buildPythonPackage rec {

     

       23
       23
        
         pname = "cgal";

     

       24
       24
       -
         version = "5.6.1.post202403291426";

     

       24
       24
       +
         version = "6.0.post202410011635";

     

       25
       25
        
         pyproject = true;

     

       26
       26
        
       

     

       27
       27
        
         src = fetchFromGitHub {

     

       28
       28
        
           owner = "CGAL";

     

       29
       29
        
           repo = "cgal-swig-bindings";

     

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

     

       31
       31
       -
           hash = "sha256-EcvS1TWL3uGCE1G8Lbfiu/AzifMdUSei+z91bzkiKes=";

     

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

     

       31
       31
       +
           hash = "sha256-KXcXykL/m+A5dCDc+f8j7GgVeQahAOaZ/+LLKHyqbS4=";

     

       32
       32
        
         };

     

       33
       33
        
       

     

       34
       34
        
         dontUseCmakeConfigure = true;

+55

pkgs/development/python-modules/drf-extra-fields/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildPythonPackage,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         setuptools,

     

       6
       6
       +
         django,

     

       7
       7
       +
         djangorestframework,

     

       8
       8
       +
         filetype,

     

       9
       9
       +
         pillow,

     

       10
       10
       +
         psycopg2,

     

       11
       11
       +
         pytestCheckHook,

     

       12
       12
       +
         pytest-django,

     

       13
       13
       +
       }:

     

       14
       14
       +
       

     

       15
       15
       +
       buildPythonPackage rec {

     

       16
       16
       +
         pname = "drf-extra-fields";

     

       17
       17
       +
         version = "3.7.0";

     

       18
       18
       +
         pyproject = true;

     

       19
       19
       +
       

     

       20
       20
       +
         src = fetchFromGitHub {

     

       21
       21
       +
           owner = "hipo";

     

       22
       22
       +
           repo = "drf-extra-fields";

     

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

     

       24
       24
       +
           hash = "sha256-Ym4vnZ/t0ZdSxU53BC0ducJl1YiTygRSWql/35PNbOU";

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         build-system = [ setuptools ];

     

       28
       28
       +
       

     

       29
       29
       +
         dependencies = [

     

       30
       30
       +
           django

     

       31
       31
       +
           djangorestframework

     

       32
       32
       +
           filetype

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         optional-dependencies = {

     

       36
       36
       +
           Base64ImageField = [ pillow ];

     

       37
       37
       +
         };

     

       38
       38
       +
       

     

       39
       39
       +
         nativeCheckInputs = [

     

       40
       40
       +
           (django.override { withGdal = true; })

     

       41
       41
       +
           psycopg2

     

       42
       42
       +
           pytestCheckHook

     

       43
       43
       +
           pytest-django

     

       44
       44
       +
         ] ++ optional-dependencies.Base64ImageField;

     

       45
       45
       +
       

     

       46
       46
       +
         pythonImportsCheck = [ "drf_extra_fields" ];

     

       47
       47
       +
       

     

       48
       48
       +
         meta = {

     

       49
       49
       +
           description = "Extra Fields for Django Rest Framework";

     

       50
       50
       +
           homepage = "https://github.com/Hipo/drf-extra-fields";

     

       51
       51
       +
           changelog = "https://github.com/Hipo/drf-extra-fields/releases/tag/${src.rev}";

     

       52
       52
       +
           license = lib.licenses.asl20;

     

       53
       53
       +
           maintainers = with lib.maintainers; [ felbinger ];

     

       54
       54
       +
         };

     

       55
       55
       +
       }

+2 -2

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

···

       31
       31
        
       

     

       32
       32
        
       buildPythonPackage rec {

     

       33
       33
        
         pname = "labelbox";

     

       34
       34
       -
         version = "5.1.0";

     

       34
       34
       +
         version = "5.2.1";

     

       35
       35
        
         pyproject = true;

     

       36
       36
        
       

     

       37
       37
        
         disabled = pythonOlder "3.8";

     
···

       40
       40
        
           owner = "Labelbox";

     

       41
       41
        
           repo = "labelbox-python";

     

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

     

       43
       43
       -
           hash = "sha256-M55cwT7BrY+8m9ec+2bKDCxGkHJp/c50Gzib4sEg7Bk=";

     

       43
       43
       +
           hash = "sha256-vfhlzkCTm1fhvCpzwAaXWPyXE8/2Yx63fTVHl5CWon4=";

     

       44
       44
        
         };

     

       45
       45
        
       

     

       46
       46
        
         sourceRoot = "${src.name}/libs/labelbox";

+43

pkgs/development/python-modules/netbox-documents/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildPythonPackage,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         setuptools,

     

       6
       6
       +
         drf-extra-fields,

     

       7
       7
       +
         python,

     

       8
       8
       +
         netbox,

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       buildPythonPackage rec {

     

       12
       12
       +
         pname = "netbox-documents";

     

       13
       13
       +
         version = "0.7.0";

     

       14
       14
       +
         pyproject = true;

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "jasonyates";

     

       18
       18
       +
           repo = "netbox-documents";

     

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

     

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

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         build-system = [ setuptools ];

     

       24
       24
       +
       

     

       25
       25
       +
         dependencies = [ drf-extra-fields ];

     

       26
       26
       +
       

     

       27
       27
       +
         nativeCheckInputs = [ netbox ];

     

       28
       28
       +
       

     

       29
       29
       +
         preFixup = ''

     

       30
       30
       +
           export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion;

     

       34
       34
       +
         pythonImportsCheck = [ "netbox_documents" ];

     

       35
       35
       +
       

     

       36
       36
       +
         meta = {

     

       37
       37
       +
           description = "Plugin designed to faciliate the storage of site, circuit, device type and device specific documents within NetBox";

     

       38
       38
       +
           homepage = "https://github.com/jasonyates/netbox-documents";

     

       39
       39
       +
           changelog = "https://github.com/jasonyates/netbox-documents/releases/tag/${src.rev}";

     

       40
       40
       +
           license = lib.licenses.asl20;

     

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

     

       42
       42
       +
         };

     

       43
       43
       +
       }

+46

pkgs/development/python-modules/opentelemetry-instrumentation-celery/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildPythonPackage,

     

       4
       4
       +
         hatchling,

     

       5
       5
       +
         opentelemetry-api,

     

       6
       6
       +
         opentelemetry-instrumentation,

     

       7
       7
       +
         opentelemetry-semantic-conventions,

     

       8
       8
       +
         opentelemetry-test-utils,

     

       9
       9
       +
         billiard,

     

       10
       10
       +
         celery,

     

       11
       11
       +
         pytestCheckHook,

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       buildPythonPackage rec {

     

       15
       15
       +
         inherit (opentelemetry-instrumentation) version src;

     

       16
       16
       +
         pname = "opentelemetry-instrumentation-celery";

     

       17
       17
       +
         pyproject = true;

     

       18
       18
       +
       

     

       19
       19
       +
         sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-celery";

     

       20
       20
       +
       

     

       21
       21
       +
         build-system = [ hatchling ];

     

       22
       22
       +
       

     

       23
       23
       +
         dependencies = [

     

       24
       24
       +
           billiard

     

       25
       25
       +
           celery

     

       26
       26
       +
           opentelemetry-api

     

       27
       27
       +
           opentelemetry-instrumentation

     

       28
       28
       +
           opentelemetry-semantic-conventions

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         optional-dependencies = {

     

       32
       32
       +
           instruments = [ celery ];

     

       33
       33
       +
         };

     

       34
       34
       +
       

     

       35
       35
       +
         nativeCheckInputs = [

     

       36
       36
       +
           opentelemetry-test-utils

     

       37
       37
       +
           pytestCheckHook

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         pythonImportsCheck = [ "opentelemetry.instrumentation.celery" ];

     

       41
       41
       +
       

     

       42
       42
       +
         meta = opentelemetry-instrumentation.meta // {

     

       43
       43
       +
           homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-celery";

     

       44
       44
       +
           description = "Celery instrumentation for OpenTelemetry";

     

       45
       45
       +
         };

     

       46
       46
       +
       }

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       +
         stdenv,

     

       3
       4
        
         buildPythonPackage,

     

       4
       5
        
         fetchFromGitHub,

     

       5
       6
        
         setuptools,

     
···

       70
       71
        
           scikit-image

     

       71
       72
        
         ];

     

       72
       73
        
       

     

       74
       74
       +
         # the check inputs are broken on darwin

     

       75
       75
       +
         doCheck = !stdenv.hostPlatform.isDarwin;

     

       76
       76
       +
       

     

       73
       77
        
         disabledTests = [

     

       74
       78
        
           # FAILED plotly/matplotlylib/mplexporter/tests/test_basic.py::test_legend_dots - AssertionError: assert '3' == '2'

     

       75
       79
        
           "test_legend_dots"

     
···

       116
       120
        
           "test_dependencies_not_imported"

     

       117
       121
        
           # FAILED test_init/test_lazy_imports.py::test_lazy_imports - AssertionError: assert 'plotly' not in {'IPython': <module 'IPython' from '...

     

       118
       122
        
           "test_lazy_imports"

     

       123
       123
       +
           # requires vaex and polars, vaex is not packaged

     

       124
       124
       +
           "test_build_df_from_vaex_and_polars"

     

       125
       125
       +
           "test_build_df_with_hover_data_from_vaex_and_polars"

     

       119
       126
        
         ];

     

       120
       127
        
       

     

       121
       128
        
         pythonImportsCheck = [ "plotly" ];

+66 -54

pkgs/development/python-modules/tokenizers/Cargo.lock

···

       62
       62
        
       

     

       63
       63
        
       [[package]]

     

       64
       64
        
       name = "autocfg"

     

       65
       65
       -
       version = "1.3.0"

     

       65
       65
       +
       version = "1.4.0"

     

       66
       66
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       67
       67
       -
       checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"

     

       67
       67
       +
       checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"

     

       68
       68
        
       

     

       69
       69
        
       [[package]]

     

       70
       70
        
       name = "base64"

     
···

       92
       92
        
       

     

       93
       93
        
       [[package]]

     

       94
       94
        
       name = "cc"

     

       95
       95
       -
       version = "1.1.8"

     

       95
       95
       +
       version = "1.1.22"

     

       96
       96
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       97
       97
       -
       checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549"

     

       97
       97
       +
       checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"

     

       98
       98
       +
       dependencies = [

     

       99
       99
       +
        "shlex",

     

       100
       100
       +
       ]

     

       98
       101
        
       

     

       99
       102
        
       [[package]]

     

       100
       103
        
       name = "cfg-if"

     
···

       183
       186
        
       

     

       184
       187
        
       [[package]]

     

       185
       188
        
       name = "derive_builder"

     

       186
       186
       -
       version = "0.20.0"

     

       189
       189
       +
       version = "0.20.1"

     

       187
       190
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       188
       188
       -
       checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7"

     

       191
       191
       +
       checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b"

     

       189
       192
        
       dependencies = [

     

       190
       193
        
        "derive_builder_macro",

     

       191
       194
        
       ]

     

       192
       195
        
       

     

       193
       196
        
       [[package]]

     

       194
       197
        
       name = "derive_builder_core"

     

       195
       195
       -
       version = "0.20.0"

     

       198
       198
       +
       version = "0.20.1"

     

       196
       199
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       197
       197
       -
       checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d"

     

       200
       200
       +
       checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38"

     

       198
       201
        
       dependencies = [

     

       199
       202
        
        "darling",

     

       200
       203
        
        "proc-macro2",

     
···

       204
       207
        
       

     

       205
       208
        
       [[package]]

     

       206
       209
        
       name = "derive_builder_macro"

     

       207
       207
       -
       version = "0.20.0"

     

       210
       210
       +
       version = "0.20.1"

     

       208
       211
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       209
       209
       -
       checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"

     

       212
       212
       +
       checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc"

     

       210
       213
        
       dependencies = [

     

       211
       214
        
        "derive_builder_core",

     

       212
       215
        
        "syn",

     
···

       268
       271
        
       

     

       269
       272
        
       [[package]]

     

       270
       273
        
       name = "fastrand"

     

       271
       271
       -
       version = "2.1.0"

     

       274
       274
       +
       version = "2.1.1"

     

       272
       275
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       273
       273
       -
       checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"

     

       276
       276
       +
       checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"

     

       274
       277
        
       

     

       275
       278
        
       [[package]]

     

       276
       279
        
       name = "fnv"

     
···

       373
       376
        
       

     

       374
       377
        
       [[package]]

     

       375
       378
        
       name = "libc"

     

       376
       376
       -
       version = "0.2.155"

     

       379
       379
       +
       version = "0.2.159"

     

       377
       380
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       378
       378
       -
       checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"

     

       381
       381
       +
       checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"

     

       379
       382
        
       

     

       380
       383
        
       [[package]]

     

       381
       384
        
       name = "linux-raw-sys"

     
···

       540
       543
        
       

     

       541
       544
        
       [[package]]

     

       542
       545
        
       name = "once_cell"

     

       543
       543
       -
       version = "1.19.0"

     

       546
       546
       +
       version = "1.20.1"

     

       544
       547
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       545
       545
       -
       checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"

     

       548
       548
       +
       checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"

     

       549
       549
       +
       dependencies = [

     

       550
       550
       +
        "portable-atomic",

     

       551
       551
       +
       ]

     

       546
       552
        
       

     

       547
       553
        
       [[package]]

     

       548
       554
        
       name = "onig"

     
···

       597
       603
        
       

     

       598
       604
        
       [[package]]

     

       599
       605
        
       name = "pkg-config"

     

       600
       600
       -
       version = "0.3.30"

     

       606
       606
       +
       version = "0.3.31"

     

       601
       607
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       602
       602
       -
       checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"

     

       608
       608
       +
       checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"

     

       603
       609
        
       

     

       604
       610
        
       [[package]]

     

       605
       611
        
       name = "portable-atomic"

     

       606
       606
       -
       version = "1.7.0"

     

       612
       612
       +
       version = "1.9.0"

     

       607
       613
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       608
       608
       -
       checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"

     

       614
       614
       +
       checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"

     

       609
       615
        
       

     

       610
       616
        
       [[package]]

     

       611
       617
        
       name = "ppv-lite86"

     
···

       690
       696
        
       

     

       691
       697
        
       [[package]]

     

       692
       698
        
       name = "quote"

     

       693
       693
       -
       version = "1.0.36"

     

       699
       699
       +
       version = "1.0.37"

     

       694
       700
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       695
       695
       -
       checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"

     

       701
       701
       +
       checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"

     

       696
       702
        
       dependencies = [

     

       697
       703
        
        "proc-macro2",

     

       698
       704
        
       ]

     
···

       766
       772
        
       

     

       767
       773
        
       [[package]]

     

       768
       774
        
       name = "redox_syscall"

     

       769
       769
       -
       version = "0.5.3"

     

       775
       775
       +
       version = "0.5.7"

     

       770
       776
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       771
       771
       -
       checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"

     

       777
       777
       +
       checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"

     

       772
       778
        
       dependencies = [

     

       773
       779
        
        "bitflags 2.6.0",

     

       774
       780
        
       ]

     

       775
       781
        
       

     

       776
       782
        
       [[package]]

     

       777
       783
        
       name = "regex"

     

       778
       778
       -
       version = "1.10.6"

     

       784
       784
       +
       version = "1.11.0"

     

       779
       785
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       780
       780
       -
       checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"

     

       786
       786
       +
       checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"

     

       781
       787
        
       dependencies = [

     

       782
       788
        
        "aho-corasick",

     

       783
       789
        
        "memchr",

     
···

       787
       793
        
       

     

       788
       794
        
       [[package]]

     

       789
       795
        
       name = "regex-automata"

     

       790
       790
       -
       version = "0.4.7"

     

       796
       796
       +
       version = "0.4.8"

     

       791
       797
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       792
       792
       -
       checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"

     

       798
       798
       +
       checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"

     

       793
       799
        
       dependencies = [

     

       794
       800
        
        "aho-corasick",

     

       795
       801
        
        "memchr",

     
···

       798
       804
        
       

     

       799
       805
        
       [[package]]

     

       800
       806
        
       name = "regex-syntax"

     

       801
       801
       -
       version = "0.8.4"

     

       807
       807
       +
       version = "0.8.5"

     

       802
       808
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       803
       803
       -
       checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"

     

       809
       809
       +
       checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"

     

       804
       810
        
       

     

       805
       811
        
       [[package]]

     

       806
       812
        
       name = "rustc-hash"

     
···

       810
       816
        
       

     

       811
       817
        
       [[package]]

     

       812
       818
        
       name = "rustix"

     

       813
       813
       -
       version = "0.38.34"

     

       819
       819
       +
       version = "0.38.37"

     

       814
       820
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       815
       815
       -
       checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"

     

       821
       821
       +
       checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"

     

       816
       822
        
       dependencies = [

     

       817
       823
        
        "bitflags 2.6.0",

     

       818
       824
        
        "errno",

     
···

       835
       841
        
       

     

       836
       842
        
       [[package]]

     

       837
       843
        
       name = "serde"

     

       838
       838
       -
       version = "1.0.205"

     

       844
       844
       +
       version = "1.0.210"

     

       839
       845
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       840
       840
       -
       checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150"

     

       846
       846
       +
       checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"

     

       841
       847
        
       dependencies = [

     

       842
       848
        
        "serde_derive",

     

       843
       849
        
       ]

     

       844
       850
        
       

     

       845
       851
        
       [[package]]

     

       846
       852
        
       name = "serde_derive"

     

       847
       847
       -
       version = "1.0.205"

     

       853
       853
       +
       version = "1.0.210"

     

       848
       854
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       849
       849
       -
       checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1"

     

       855
       855
       +
       checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"

     

       850
       856
        
       dependencies = [

     

       851
       857
        
        "proc-macro2",

     

       852
       858
        
        "quote",

     
···

       855
       861
        
       

     

       856
       862
        
       [[package]]

     

       857
       863
        
       name = "serde_json"

     

       858
       858
       -
       version = "1.0.122"

     

       864
       864
       +
       version = "1.0.128"

     

       859
       865
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       860
       860
       -
       checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"

     

       866
       866
       +
       checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"

     

       861
       867
        
       dependencies = [

     

       862
       868
        
        "itoa",

     

       863
       869
        
        "memchr",

     

       864
       870
        
        "ryu",

     

       865
       871
        
        "serde",

     

       866
       872
        
       ]

     

       873
       873
       +
       

     

       874
       874
       +
       [[package]]

     

       875
       875
       +
       name = "shlex"

     

       876
       876
       +
       version = "1.3.0"

     

       877
       877
       +
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       878
       878
       +
       checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"

     

       867
       879
        
       

     

       868
       880
        
       [[package]]

     

       869
       881
        
       name = "smallvec"

     
···

       891
       903
        
       

     

       892
       904
        
       [[package]]

     

       893
       905
        
       name = "syn"

     

       894
       894
       -
       version = "2.0.72"

     

       906
       906
       +
       version = "2.0.79"

     

       895
       907
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       896
       896
       -
       checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"

     

       908
       908
       +
       checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"

     

       897
       909
        
       dependencies = [

     

       898
       910
        
        "proc-macro2",

     

       899
       911
        
        "quote",

     
···

       908
       920
        
       

     

       909
       921
        
       [[package]]

     

       910
       922
        
       name = "tempfile"

     

       911
       911
       -
       version = "3.12.0"

     

       923
       923
       +
       version = "3.13.0"

     

       912
       924
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       913
       913
       -
       checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"

     

       925
       925
       +
       checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"

     

       914
       926
        
       dependencies = [

     

       915
       927
        
        "cfg-if",

     

       916
       928
        
        "fastrand",

     
···

       921
       933
        
       

     

       922
       934
        
       [[package]]

     

       923
       935
        
       name = "thiserror"

     

       924
       924
       -
       version = "1.0.63"

     

       936
       936
       +
       version = "1.0.64"

     

       925
       937
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       926
       926
       -
       checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"

     

       938
       938
       +
       checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"

     

       927
       939
        
       dependencies = [

     

       928
       940
        
        "thiserror-impl",

     

       929
       941
        
       ]

     

       930
       942
        
       

     

       931
       943
        
       [[package]]

     

       932
       944
        
       name = "thiserror-impl"

     

       933
       933
       -
       version = "1.0.63"

     

       945
       945
       +
       version = "1.0.64"

     

       934
       946
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       935
       935
       -
       checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"

     

       947
       947
       +
       checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"

     

       936
       948
        
       dependencies = [

     

       937
       949
        
        "proc-macro2",

     

       938
       950
        
        "quote",

     
···

       941
       953
        
       

     

       942
       954
        
       [[package]]

     

       943
       955
        
       name = "tokenizers"

     

       944
       944
       -
       version = "0.20.0-rc1"

     

       956
       956
       +
       version = "0.20.0-dev.0"

     

       945
       957
        
       dependencies = [

     

       946
       958
        
        "aho-corasick",

     

       947
       959
        
        "derive_builder",

     
···

       971
       983
        
       

     

       972
       984
        
       [[package]]

     

       973
       985
        
       name = "tokenizers-python"

     

       974
       974
       -
       version = "0.20.0-rc1"

     

       986
       986
       +
       version = "0.20.0-dev.0"

     

       975
       987
        
       dependencies = [

     

       976
       988
        
        "env_logger",

     

       977
       989
        
        "itertools 0.12.1",

     
···

       988
       1000
        
       

     

       989
       1001
        
       [[package]]

     

       990
       1002
        
       name = "unicode-ident"

     

       991
       991
       -
       version = "1.0.12"

     

       1003
       1003
       +
       version = "1.0.13"

     

       992
       1004
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       993
       993
       -
       checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"

     

       1005
       1005
       +
       checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"

     

       994
       1006
        
       

     

       995
       1007
        
       [[package]]

     

       996
       1008
        
       name = "unicode-normalization-alignments"

     
···

       1003
       1015
        
       

     

       1004
       1016
        
       [[package]]

     

       1005
       1017
        
       name = "unicode-segmentation"

     

       1006
       1006
       -
       version = "1.11.0"

     

       1018
       1018
       +
       version = "1.12.0"

     

       1007
       1019
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       1008
       1008
       -
       checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"

     

       1020
       1020
       +
       checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"

     

       1009
       1021
        
       

     

       1010
       1022
        
       [[package]]

     

       1011
       1023
        
       name = "unicode-width"

     

       1012
       1012
       -
       version = "0.1.13"

     

       1024
       1024
       +
       version = "0.1.14"

     

       1013
       1025
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       1014
       1014
       -
       checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"

     

       1026
       1026
       +
       checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"

     

       1015
       1027
        
       

     

       1016
       1028
        
       [[package]]

     

       1017
       1029
        
       name = "unicode_categories"

+4 -3

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

···

       52
       52
        
           };

     

       53
       53
        
           "big.txt" = fetchurl {

     

       54
       54
        
             url = "https://norvig.com/big.txt";

     

       55
       55
       -
             sha256 = "sha256-+gZsfUDw8gGsQUTmUqpiQw5YprOAXscGUPZ42lgE6Hs=";

     

       55
       55
       +
             hash = "sha256-+gZsfUDw8gGsQUTmUqpiQw5YprOAXscGUPZ42lgE6Hs=";

     

       56
       56
        
           };

     

       57
       57
        
           "bert-wiki.json" = fetchurl {

     

       58
       58
        
             url = "https://s3.amazonaws.com/models.huggingface.co/bert/anthony/doc-pipeline/tokenizer.json";

     
···

       74
       74
        
       in

     

       75
       75
        
       buildPythonPackage rec {

     

       76
       76
        
         pname = "tokenizers";

     

       77
       77
       -
         version = "0.20.0";

     

       77
       77
       +
         version = "0.20.1";

     

       78
       78
        
         pyproject = true;

     

       79
       79
        
       

     

       80
       80
        
         src = fetchFromGitHub {

     

       81
       81
        
           owner = "huggingface";

     

       82
       82
        
           repo = "tokenizers";

     

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

     

       84
       84
       -
           hash = "sha256-uuSHsdyx77YQjf1aiz7EJ/X+6RaOgfmjGqHSlMaCWDI=";

     

       84
       84
       +
           hash = "sha256-QTe1QdmJHSoosNG9cCJS7uQNdoMwgL+CJHQQUX5VtSY=";

     

       85
       85
        
         };

     

       86
       86
        
       

     

       87
       87
        
         cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };

     
···

       149
       149
        
         meta = {

     

       150
       150
        
           description = "Fast State-of-the-Art Tokenizers optimized for Research and Production";

     

       151
       151
        
           homepage = "https://github.com/huggingface/tokenizers";

     

       152
       152
       +
           changelog = "https://github.com/huggingface/tokenizers/releases/tag/v${version}";

     

       152
       153
        
           license = lib.licenses.asl20;

     

       153
       154
        
           maintainers = with lib.maintainers; [ GaetanLepage ];

     

       154
       155
        
           platforms = lib.platforms.unix;

+8 -8

pkgs/os-specific/linux/kernel/kernels-org.json

···

       1
       1
        
       {

     

       2
       2
        
           "testing": {

     

       3
       3
       -
               "version": "6.12-rc1",

     

       4
       4
       -
               "hash": "sha256:16zwvjcvgndvr0izx0qs2k7v85nvxwlx6j7y2yrdl3shalsdlmx2"

     

       3
       3
       +
               "version": "6.12-rc2",

     

       4
       4
       +
               "hash": "sha256:1cwivhfnfam79dvqj22vr63ng7330w6wihkx01l4l2q7f5kl896x"

     

       5
       5
        
           },

     

       6
       6
        
           "6.1": {

     

       7
       7
        
               "version": "6.1.112",

     
···

       20
       20
        
               "hash": "sha256:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp"

     

       21
       21
        
           },

     

       22
       22
        
           "6.6": {

     

       23
       23
       -
               "version": "6.6.54",

     

       24
       24
       -
               "hash": "sha256:186ggr0yz7fgp05qav6k6j72aazvwdljdnf2zwb5q194dafqdbjz"

     

       23
       23
       +
               "version": "6.6.56",

     

       24
       24
       +
               "hash": "sha256:158snxmb2silss8bndpzp8fmafp175v11jrlci0jr6c8ivvi4j7p"

     

       25
       25
        
           },

     

       26
       26
        
           "6.10": {

     

       27
       27
       -
               "version": "6.10.13",

     

       28
       28
       -
               "hash": "sha256:0smimvnivdswiggplz9x65d03vdysgr3v9iijbk4f5fva0iypz2z"

     

       27
       27
       +
               "version": "6.10.14",

     

       28
       28
       +
               "hash": "sha256:0gj2z9ax1qv59n2mld0pg2svwi28lbq92ql98vy7crynd2ybrram"

     

       29
       29
        
           },

     

       30
       30
        
           "6.11": {

     

       31
       31
       -
               "version": "6.11.2",

     

       32
       32
       -
               "hash": "sha256:0hlwsfq6brdkdcwdq6d1aq2b210hkqgpmy0y1sa5bfyfp6hgg7pc"

     

       31
       31
       +
               "version": "6.11.3",

     

       32
       32
       +
               "hash": "sha256:0wwv8jaipx352rna6bxj6jklmnm4kcikvzaag59m4zf1mz866wh5"

     

       33
       33
        
           }

     

       34
       34
        
       }

+2 -2

pkgs/os-specific/linux/kernel/linux-libre.nix

···

       1
       1
        
       { stdenv, lib, fetchsvn, linux

     

       2
       2
        
       , scripts ? fetchsvn {

     

       3
       3
        
           url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";

     

       4
       4
       -
           rev = "19631";

     

       5
       5
       -
           sha256 = "0hydmrdwqrrmrnk6r583m7c2hq1k68c9c8yqjc0bd6q4x7ys32ci";

     

       4
       4
       +
           rev = "19643";

     

       5
       5
       +
           sha256 = "1gnji0hglzh6kj9ssawlrix1vlbcyfjdjx5d9qwpnn2p0sgsq7nj";

     

       6
       6
        
         }

     

       7
       7
        
       , ...

     

       8
       8
        
       } @ args:

pkgs/servers/home-assistant/custom-components/default.nix

···

       52
       52
        
       

     

       53
       53
        
         moonraker = callPackage ./moonraker {};

     

       54
       54
        
       

     

       55
       55
       +
         nest_protect = callPackage ./nest_protect {};

     

       56
       56
       +
       

     

       55
       57
        
         ntfy = callPackage ./ntfy {};

     

       56
       58
        
       

     

       57
       59
        
         omnik_inverter = callPackage ./omnik_inverter {};

+2 -2

pkgs/servers/home-assistant/custom-components/miele/default.nix

···

       8
       8
        
       buildHomeAssistantComponent rec {

     

       9
       9
        
         owner = "astrandb";

     

       10
       10
        
         domain = "miele";

     

       11
       11
       -
         version = "2024.3.0";

     

       11
       11
       +
         version = "2024.8.1";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           inherit owner;

     

       15
       15
        
           repo = domain;

     

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

     

       17
       17
       -
           hash = "sha256-J9n4PFcd87L301B2YktrLcxp5Vu1HwDeCYnrMEJ0+TA=";

     

       17
       17
       +
           hash = "sha256-XwaOQJvosCUXMZYrKX7sMWJIrMx36RhuVYUq163vvNg=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         propagatedBuildInputs = [

+30

pkgs/servers/home-assistant/custom-components/nest_protect/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         fetchFromGitHub,

     

       4
       4
       +
         buildHomeAssistantComponent,

     

       5
       5
       +
       }:

     

       6
       6
       +
       buildHomeAssistantComponent rec {

     

       7
       7
       +
         owner = "iMicknl";

     

       8
       8
       +
         domain = "nest_protect";

     

       9
       9
       +
         version = "0.3.12";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchFromGitHub {

     

       12
       12
       +
           inherit owner;

     

       13
       13
       +
           repo = "ha-nest-protect";

     

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

     

       15
       15
       +
           hash = "sha256-IiHndx+mQVfpMLisiRwSEhrFJ3mJ4qaWTxZrubowkQs=";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         dontBuild = true;

     

       19
       19
       +
       

     

       20
       20
       +
         # AttributeError: 'async_generator' object has no attribute 'data'

     

       21
       21
       +
         doCheck = false;

     

       22
       22
       +
       

     

       23
       23
       +
         meta = with lib; {

     

       24
       24
       +
           changelog = "https://github.com/iMicknl/ha-nest-protect/releases/tag/v${version}";

     

       25
       25
       +
           description = "Nest Protect integration for Home Assistant";

     

       26
       26
       +
           homepage = "https://github.com/iMicknl/ha-nest-protect";

     

       27
       27
       +
           maintainers = with maintainers; [ jamiemagee ];

     

       28
       28
       +
           license = licenses.mit;

     

       29
       29
       +
         };

     

       30
       30
       +
       }

-64

pkgs/tools/networking/chrony/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, pkg-config

     

       2
       2
       -
       , gnutls, libedit, nspr, nss, readline, texinfo

     

       3
       3
       -
       , libcap, libseccomp, pps-tools

     

       4
       4
       -
       , nixosTests

     

       5
       5
       -
       }:

     

       6
       6
       -
       

     

       7
       7
       -
       stdenv.mkDerivation rec {

     

       8
       8
       -
         pname = "chrony";

     

       9
       9
       -
         version = "4.5";

     

       10
       10
       -
       

     

       11
       11
       -
         src = fetchurl {

     

       12
       12
       -
           url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz";

     

       13
       13
       -
           hash = "sha256-Gf4dn0Zk1EWmmpbHHo/bYLzY3yTHPROG4CKH9zZq1CI=";

     

       14
       14
       -
         };

     

       15
       15
       -
       

     

       16
       16
       -
         outputs = [ "out" "man" ];

     

       17
       17
       -
       

     

       18
       18
       -
         nativeBuildInputs = [ pkg-config ];

     

       19
       19
       -
       

     

       20
       20
       -
         buildInputs = [ gnutls libedit nspr nss readline texinfo ]

     

       21
       21
       -
           ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap libseccomp pps-tools ];

     

       22
       22
       -
       

     

       23
       23
       -
         configureFlags = [

     

       24
       24
       -
           "--enable-ntp-signd"

     

       25
       25
       -
           "--sbindir=$(out)/bin"

     

       26
       26
       -
           "--chronyrundir=/run/chrony"

     

       27
       27
       -
         ] ++ lib.optional stdenv.hostPlatform.isLinux "--enable-scfilter";

     

       28
       28
       -
       

     

       29
       29
       -
         patches = [

     

       30
       30
       -
           # Cleanup the installation script

     

       31
       31
       -
           ./makefile.patch

     

       32
       32
       -
         ];

     

       33
       33
       -
       

     

       34
       34
       -
         postPatch = ''

     

       35
       35
       -
           patchShebangs test

     

       36
       36
       -
         '';

     

       37
       37
       -
       

     

       38
       38
       -
         hardeningEnable = [ "pie" ];

     

       39
       39
       -
       

     

       40
       40
       -
         passthru.tests = { inherit (nixosTests) chrony chrony-ptp; };

     

       41
       41
       -
       

     

       42
       42
       -
         meta = with lib; {

     

       43
       43
       -
           description = "Sets your computer's clock from time servers on the Net";

     

       44
       44
       -
           homepage = "https://chrony.tuxfamily.org/";

     

       45
       45
       -
           license = licenses.gpl2Only;

     

       46
       46
       -
           platforms = with platforms; linux ++ freebsd ++ openbsd;

     

       47
       47
       -
           maintainers = with maintainers; [ fpletz thoughtpolice ];

     

       48
       48
       -
       

     

       49
       49
       -
           longDescription = ''

     

       50
       50
       -
             Chronyd is a daemon which runs in background on the system. It obtains

     

       51
       51
       -
             measurements via the network of the system clock’s offset relative to

     

       52
       52
       -
             time servers on other systems and adjusts the system time accordingly.

     

       53
       53
       -
             For isolated systems, the user can periodically enter the correct time by

     

       54
       54
       -
             hand (using Chronyc). In either case, Chronyd determines the rate at

     

       55
       55
       -
             which the computer gains or loses time, and compensates for this. Chronyd

     

       56
       56
       -
             implements the NTP protocol and can act as either a client or a server.

     

       57
       57
       -
       

     

       58
       58
       -
             Chronyc provides a user interface to Chronyd for monitoring its

     

       59
       59
       -
             performance and configuring various settings. It can do so while running

     

       60
       60
       -
             on the same computer as the Chronyd instance it is controlling or a

     

       61
       61
       -
             different computer.

     

       62
       62
       -
           '';

     

       63
       63
       -
         };

     

       64
       64
       -
       }

pkgs/tools/networking/chrony/makefile.patch pkgs/by-name/ch/chrony/makefile.patch

+3 -3

pkgs/tools/system/netdata/default.nix

···

       53
       53
        
         stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;

     

       54
       54
        
       in

     

       55
       55
        
       stdenv'.mkDerivation (finalAttrs: {

     

       56
       56
       -
         version = "1.47.1";

     

       56
       56
       +
         version = "1.47.3";

     

       57
       57
        
         pname = "netdata";

     

       58
       58
        
       

     

       59
       59
        
         src = fetchFromGitHub {

     
···

       62
       62
        
           rev = "v${finalAttrs.version}";

     

       63
       63
        
           hash =

     

       64
       64
        
             if withCloudUi then

     

       65
       65
       -
               "sha256-/iXmIjWpZ0s/LELZM7rYYQ9cjLNdfdisyOvDyLddSY4="

     

       65
       65
       +
               "sha256-rua4wDkTEQbH5fS6gVDF0y3QsQ+eG8Eki4JFxmiRN5k="

     

       66
       66
        
             # we delete the v2 GUI after fetching

     

       67
       67
        
             else

     

       68
       68
       -
               "sha256-pAqxxsWYgqbmF6wFBfTCYYc3x/Ufyz2Xs4bwB1ToHjo=";

     

       68
       68
       +
               "sha256-IR54OgYiOAmDgysm+3MLeMkxyNWkJe3BLKL9gaFHdvo=";

     

       69
       69
        
           fetchSubmodules = true;

     

       70
       70
        
       

     

       71
       71
        
           # Remove v2 dashboard distributed under NCUL1. Make sure an empty

+5 -2

pkgs/tools/video/rtmpdump/default.nix

···

       31
       31
        
           })

     

       32
       32
        
         ];

     

       33
       33
        
       

     

       34
       34
       +
         preBuild = ''

     

       35
       35
       +
           makeFlagsArray+=(CC="$CC")

     

       36
       36
       +
         '';

     

       37
       37
       +
       

     

       34
       38
        
         makeFlags = [

     

       35
       39
        
           "prefix=$(out)"

     

       36
       40
        
           "CROSS_COMPILE=${stdenv.cc.targetPrefix}"

     

       37
       41
        
         ]

     

       38
       42
        
           ++ lib.optional gnutlsSupport "CRYPTO=GNUTLS"

     

       39
       43
        
           ++ lib.optional opensslSupport "CRYPTO=OPENSSL"

     

       40
       40
       -
           ++ lib.optional stdenv.hostPlatform.isDarwin "SYS=darwin"

     

       41
       41
       -
           ++ lib.optional stdenv.cc.isClang "CC=clang";

     

       44
       44
       +
           ++ lib.optional stdenv.hostPlatform.isDarwin "SYS=darwin";

     

       42
       45
        
       

     

       43
       46
        
         propagatedBuildInputs = [ zlib ]

     

       44
       47
        
           ++ lib.optionals gnutlsSupport [ gnutls nettle ]

+2 -1

pkgs/top-level/aliases.nix

···

       308
       308
        
         clang16Stdenv = lowPrio llvmPackages_16.stdenv;

     

       309
       309
        
         clang17Stdenv = lowPrio llvmPackages_17.stdenv;

     

       310
       310
        
         clang18Stdenv = lowPrio llvmPackages_18.stdenv;

     

       311
       311
       +
         clang19Stdenv = lowPrio llvmPackages_19.stdenv;

     

       311
       312
        
       

     

       312
       313
        
         clang-tools_6 = throw "clang-tools_6 has been removed from nixpkgs"; # Added 2024-01-08

     

       313
       314
        
         clang-tools_7 = throw "clang-tools_7 has been removed from nixpkgs"; # Added 2023-11-19

     
···

       329
       330
        
         clang-tools_16 = llvmPackages_16.clang-tools; # Added 2024-04-22

     

       330
       331
        
         clang-tools_17 = llvmPackages_17.clang-tools; # Added 2024-04-22

     

       331
       332
        
         clang-tools_18 = llvmPackages_18.clang-tools; # Added 2024-04-22

     

       333
       333
       +
         clang-tools_19 = llvmPackages_19.clang-tools; # Added 2024-08-21

     

       332
       334
        
       

     

       333
       335
        
         cq-editor = throw "cq-editor has been removed, as it use a dependency that was disabled since python 3.8 and was last updated in 2021"; # Added 2024-05-13

     

       334
       336
        
       

     
···

       829
       831
        
         libbpf_1 = libbpf; # Added 2022-12-06

     

       830
       832
        
         libbson = mongoc; # Added 2024-03-11

     

       831
       833
        
         libcap_pam = throw "'libcap_pam' has been replaced with 'libcap'"; # Converted to throw 2023-09-10

     

       832
       832
       -
         libclc = llvmPackages_18.libclc; # Added 2023-10-28

     

       833
       834
        
         libcxxabi = throw "'libcxxabi' was merged into 'libcxx'"; # Converted to throw 2024-03-08

     

       834
       835
        
         libdwarf_20210528 = throw "'libdwarf_20210528' has been removed because it is not used in nixpkgs, move to libdwarf"; # Added 2024-03-23

     

       835
       836
        
         libgme = game-music-emu; # Added 2022-07-20

+3 -4

pkgs/top-level/all-packages.nix

···

       2384
       2384
        
       

     

       2385
       2385
        
         gitweb = callPackage ../applications/version-management/gitweb { };

     

       2386
       2386
        
       

     

       2387
       2387
       -
         glab = callPackage ../applications/version-management/glab { };

     

       2388
       2388
       -
       

     

       2389
       2387
        
         glitter = callPackage ../applications/version-management/glitter { };

     

       2390
       2388
        
       

     

       2391
       2389
        
         globalping-cli = callPackage ../tools/networking/globalping-cli { };

     
···

       6263
       6261
        
       

     

       6264
       6262
        
         chkrootkit = callPackage ../tools/security/chkrootkit { };

     

       6265
       6263
        
       

     

       6266
       6266
       -
         chrony = callPackage ../tools/networking/chrony { };

     

       6267
       6267
       -
       

     

       6268
       6264
        
         chunkfs = callPackage ../tools/filesystems/chunkfs { };

     

       6269
       6265
        
       

     

       6270
       6266
        
         chunksync = callPackage ../tools/backup/chunksync { };

     
···

       6832
       6828
        
         decode-spam-headers = callPackage ../tools/networking/decode-spam-headers { };

     

       6833
       6829
        
       

     

       6834
       6830
        
         deer = callPackage ../shells/zsh/zsh-deer { };

     

       6831
       6831
       +
       

     

       6832
       6832
       +
         deno_1 = callPackage ../by-name/de/deno/1/package.nix { };

     

       6835
       6833
        
       

     

       6836
       6834
        
         deqp-runner = callPackage ../tools/graphics/deqp-runner { };

     

       6837
       6835
        
       

     
···

       15258
       15256
        
         mlir_16 = llvmPackages_16.mlir;

     

       15259
       15257
        
         mlir_17 = llvmPackages_17.mlir;

     

       15260
       15258
        
       

     

       15259
       15259
       +
         libclc = llvmPackages.libclc;

     

       15261
       15260
        
         libllvm = llvmPackages.libllvm;

     

       15262
       15261
        
         llvm-manpages = llvmPackages.llvm-manpages;

     

       15263
       15262

pkgs/top-level/python-packages.nix

···

       3734
       3734
        
       

     

       3735
       3735
        
         dremel3dpy = callPackage ../development/python-modules/dremel3dpy { };

     

       3736
       3736
        
       

     

       3737
       3737
       +
         drf-extra-fields = callPackage ../development/python-modules/drf-extra-fields { };

     

       3738
       3738
       +
       

     

       3737
       3739
        
         drf-jwt = callPackage ../development/python-modules/drf-jwt { };

     

       3738
       3740
        
       

     

       3739
       3741
        
         drf-nested-routers = callPackage ../development/python-modules/drf-nested-routers { };

     
···

       8859
       8861
        
       

     

       8860
       8862
        
         netapp-ontap = callPackage ../development/python-modules/netapp-ontap { };

     

       8861
       8863
        
       

     

       8864
       8864
       +
         netbox-documents = callPackage ../development/python-modules/netbox-documents { };

     

       8865
       8865
       +
       

     

       8862
       8866
        
         netbox-reorder-rack = callPackage ../development/python-modules/netbox-reorder-rack { };

     

       8863
       8867
        
       

     

       8864
       8868
        
         netcdf4 = callPackage ../development/python-modules/netcdf4 { };

     
···

       9388
       9392
        
         opentelemetry-instrumentation-aiohttp-client = callPackage ../development/python-modules/opentelemetry-instrumentation-aiohttp-client { };

     

       9389
       9393
        
       

     

       9390
       9394
        
         opentelemetry-instrumentation-asgi = callPackage ../development/python-modules/opentelemetry-instrumentation-asgi { };

     

       9395
       9395
       +
       

     

       9396
       9396
       +
         opentelemetry-instrumentation-celery = callPackage ../development/python-modules/opentelemetry-instrumentation-celery { };

     

       9391
       9397
        
       

     

       9392
       9398
        
         opentelemetry-instrumentation-dbapi = callPackage ../development/python-modules/opentelemetry-instrumentation-dbapi { };

     

       9393
       9399