commit 86f6b16d284577abedc17f8a738cd6fe842acbd2 · pyrox.dev/nixpkgs

+2 -2

lib/strings.nix

···

       629
       629
        
                   This behavior is deprecated and will throw an error in the future.''

     

       630
       630
        
           (let

     

       631
       631
        
             preLen = stringLength prefix;

     

       632
       632
       -
             sLen = stringLength str;

     

       633
       632
        
           in

     

       634
       633
        
             if substring 0 preLen str == prefix then

     

       635
       635
       -
               substring preLen (sLen - preLen) str

     

       634
       634
       +
               # -1 will take the string until the end

     

       635
       635
       +
               substring preLen (-1) str

     

       636
       636
        
             else

     

       637
       637
        
               str);

     

       638
       638

+21

lib/tests/misc.nix

···

       349
       349
        
           expected = true;

     

       350
       350
        
         };

     

       351
       351
        
       

     

       352
       352
       +
         testRemovePrefixExample1 = {

     

       353
       353
       +
           expr = removePrefix "foo." "foo.bar.baz";

     

       354
       354
       +
           expected = "bar.baz";

     

       355
       355
       +
         };

     

       356
       356
       +
         testRemovePrefixExample2 = {

     

       357
       357
       +
           expr = removePrefix "xxx" "foo.bar.baz";

     

       358
       358
       +
           expected = "foo.bar.baz";

     

       359
       359
       +
         };

     

       360
       360
       +
         testRemovePrefixEmptyPrefix = {

     

       361
       361
       +
           expr = removePrefix "" "foo";

     

       362
       362
       +
           expected = "foo";

     

       363
       363
       +
         };

     

       364
       364
       +
         testRemovePrefixEmptyString = {

     

       365
       365
       +
           expr = removePrefix "foo" "";

     

       366
       366
       +
           expected = "";

     

       367
       367
       +
         };

     

       368
       368
       +
         testRemovePrefixEmptyBoth = {

     

       369
       369
       +
           expr = removePrefix "" "";

     

       370
       370
       +
           expected = "";

     

       371
       371
       +
         };

     

       372
       372
       +
       

     

       352
       373
        
         testNormalizePath = {

     

       353
       374
        
           expr = strings.normalizePath "//a/b//c////d/";

     

       354
       375
        
           expected = "/a/b/c/d/";

+18

maintainers/maintainer-list.nix

···

       8724
       8724
        
           githubId = 1927188;

     

       8725
       8725
        
           name = "karolchmist";

     

       8726
       8726
        
         };

     

       8727
       8727
       +
         katexochen = {

     

       8728
       8728
       +
           github = "katexochen";

     

       8729
       8729
       +
           githubId = 49727155;

     

       8730
       8730
       +
           name = "Paul Meyer";

     

       8731
       8731
       +
         };

     

       8727
       8732
        
         kayhide = {

     

       8728
       8733
        
           email = "kayhide@gmail.com";

     

       8729
       8734
        
           github = "kayhide";

     
···

       15081
       15086
        
             fingerprint = "30BB FF3F AB0B BB3E 0435  F83C 8E8F F66E 2AE8 D970";

     

       15082
       15087
        
           }];

     

       15083
       15088
        
         };

     

       15089
       15089
       +
         scm2342 = {

     

       15090
       15090
       +
           name = "Sven Mattsen";

     

       15091
       15091
       +
           email = "nix@sven.cc";

     

       15092
       15092
       +
           matrix = "@scm:matrix.sven.cc";

     

       15093
       15093
       +
           github = "scm2342";

     

       15094
       15094
       +
           githubId = 154108;

     

       15095
       15095
       +
         };

     

       15084
       15096
        
         scode = {

     

       15085
       15097
        
           email = "peter.schuller@infidyne.com";

     

       15086
       15098
        
           github = "scode";

     
···

       17786
       17798
        
           keys = [{

     

       17787
       17799
        
             fingerprint = "5814 50EB 6E17 E715 7C63  E7F1 9879 8C3C 4D68 8D6D";

     

       17788
       17800
        
           }];

     

       17801
       17801
       +
         };

     

       17802
       17802
       +
         viluon = {

     

       17803
       17803
       +
           email = "nix@viluon.me";

     

       17804
       17804
       +
           github = "viluon";

     

       17805
       17805
       +
           githubId = 7235381;

     

       17806
       17806
       +
           name = "Ondřej Kvapil";

     

       17789
       17807
        
         };

     

       17790
       17808
        
         vincentbernat = {

     

       17791
       17809
        
           email = "vincent@bernat.ch";

+6 -11

nixos/modules/services/networking/haproxy.nix

···

       17
       17
        
         options = {

     

       18
       18
        
           services.haproxy = {

     

       19
       19
        
       

     

       20
       20
       -
             enable = mkOption {

     

       21
       21
       -
               type = types.bool;

     

       22
       22
       -
               default = false;

     

       23
       23
       -
               description = lib.mdDoc ''

     

       24
       24
       -
                 Whether to enable HAProxy, the reliable, high performance TCP/HTTP

     

       25
       25
       -
                 load balancer.

     

       26
       26
       -
               '';

     

       27
       27
       -
             };

     

       20
       20
       +
             enable = mkEnableOption (lib.mdDoc "HAProxy, the reliable, high performance TCP/HTTP load balancer.");

     

       21
       21
       +
       

     

       22
       22
       +
             package = mkPackageOptionMD pkgs "haproxy" { };

     

       28
       23
        
       

     

       29
       24
        
             user = mkOption {

     

       30
       25
        
               type = types.str;

     
···

       70
       65
        
               ExecStartPre = [

     

       71
       66
        
                 # when the master process receives USR2, it reloads itself using exec(argv[0]),

     

       72
       67
        
                 # so we create a symlink there and update it before reloading

     

       73
       73
       -
                 "${pkgs.coreutils}/bin/ln -sf ${pkgs.haproxy}/sbin/haproxy /run/haproxy/haproxy"

     

       68
       68
       +
                 "${pkgs.coreutils}/bin/ln -sf ${lib.getExe cfg.package} /run/haproxy/haproxy"

     

       74
       69
        
                 # when running the config test, don't be quiet so we can see what goes wrong

     

       75
       70
        
                 "/run/haproxy/haproxy -c -f ${haproxyCfg}"

     

       76
       71
        
               ];

     

       77
       72
        
               ExecStart = "/run/haproxy/haproxy -Ws -f /etc/haproxy.cfg -p /run/haproxy/haproxy.pid";

     

       78
       73
        
               # support reloading

     

       79
       74
        
               ExecReload = [

     

       80
       80
       -
                 "${pkgs.haproxy}/sbin/haproxy -c -f ${haproxyCfg}"

     

       81
       81
       -
                 "${pkgs.coreutils}/bin/ln -sf ${pkgs.haproxy}/sbin/haproxy /run/haproxy/haproxy"

     

       75
       75
       +
                 "${lib.getExe cfg.package} -c -f ${haproxyCfg}"

     

       76
       76
       +
                 "${pkgs.coreutils}/bin/ln -sf ${lib.getExe cfg.package} /run/haproxy/haproxy"

     

       82
       77
        
                 "${pkgs.coreutils}/bin/kill -USR2 $MAINPID"

     

       83
       78
        
               ];

     

       84
       79
        
               KillMode = "mixed";

+8 -6

nixos/modules/services/security/kanidm.nix

···

       69
       69
        
           enableServer = lib.mkEnableOption (lib.mdDoc "the Kanidm server");

     

       70
       70
        
           enablePam = lib.mkEnableOption (lib.mdDoc "the Kanidm PAM and NSS integration");

     

       71
       71
        
       

     

       72
       72
       +
           package = lib.mkPackageOptionMD pkgs "kanidm" {};

     

       73
       73
       +
       

     

       72
       74
        
           serverSettings = lib.mkOption {

     

       73
       75
        
             type = lib.types.submodule {

     

       74
       76
        
               freeformType = settingsFormat.type;

     
···

       222
       224
        
               }

     

       223
       225
        
             ];

     

       224
       226
        
       

     

       225
       225
       -
           environment.systemPackages = lib.mkIf cfg.enableClient [ pkgs.kanidm ];

     

       227
       227
       +
           environment.systemPackages = lib.mkIf cfg.enableClient [ cfg.package ];

     

       226
       228
        
       

     

       227
       229
        
           systemd.services.kanidm = lib.mkIf cfg.enableServer {

     

       228
       230
        
             description = "kanidm identity management daemon";

     
···

       237
       239
        
                 StateDirectory = "kanidm";

     

       238
       240
        
                 StateDirectoryMode = "0700";

     

       239
       241
        
                 RuntimeDirectory = "kanidmd";

     

       240
       240
       -
                 ExecStart = "${pkgs.kanidm}/bin/kanidmd server -c ${serverConfigFile}";

     

       242
       242
       +
                 ExecStart = "${cfg.package}/bin/kanidmd server -c ${serverConfigFile}";

     

       241
       243
        
                 User = "kanidm";

     

       242
       244
        
                 Group = "kanidm";

     

       243
       245
        
       

     
···

       270
       272
        
                 CacheDirectory = "kanidm-unixd";

     

       271
       273
        
                 CacheDirectoryMode = "0700";

     

       272
       274
        
                 RuntimeDirectory = "kanidm-unixd";

     

       273
       273
       -
                 ExecStart = "${pkgs.kanidm}/bin/kanidm_unixd";

     

       275
       275
       +
                 ExecStart = "${cfg.package}/bin/kanidm_unixd";

     

       274
       276
        
                 User = "kanidm-unixd";

     

       275
       277
        
                 Group = "kanidm-unixd";

     

       276
       278
        
       

     
···

       302
       304
        
             partOf = [ "kanidm-unixd.service" ];

     

       303
       305
        
             restartTriggers = [ unixConfigFile clientConfigFile ];

     

       304
       306
        
             serviceConfig = {

     

       305
       305
       -
               ExecStart = "${pkgs.kanidm}/bin/kanidm_unixd_tasks";

     

       307
       307
       +
               ExecStart = "${cfg.package}/bin/kanidm_unixd_tasks";

     

       306
       308
        
       

     

       307
       309
        
               BindReadOnlyPaths = [

     

       308
       310
        
                 "/nix/store"

     
···

       346
       348
        
             })

     

       347
       349
        
           ];

     

       348
       350
        
       

     

       349
       349
       -
           system.nssModules = lib.mkIf cfg.enablePam [ pkgs.kanidm ];

     

       351
       351
       +
           system.nssModules = lib.mkIf cfg.enablePam [ cfg.package ];

     

       350
       352
        
       

     

       351
       353
        
           system.nssDatabases.group = lib.optional cfg.enablePam "kanidm";

     

       352
       354
        
           system.nssDatabases.passwd = lib.optional cfg.enablePam "kanidm";

     
···

       365
       367
        
                 description = "Kanidm server";

     

       366
       368
        
                 isSystemUser = true;

     

       367
       369
        
                 group = "kanidm";

     

       368
       368
       -
                 packages = with pkgs; [ kanidm ];

     

       370
       370
       +
                 packages = [ cfg.package ];

     

       369
       371
        
               };

     

       370
       372
        
             })

     

       371
       373
        
             (lib.mkIf cfg.enablePam {

+52 -12

nixos/modules/services/web-apps/invidious.nix

···

       7
       7
        
       

     

       8
       8
        
         settingsFile = settingsFormat.generate "invidious-settings" cfg.settings;

     

       9
       9
        
       

     

       10
       10
       +
         generatedHmacKeyFile = "/var/lib/invidious/hmac_key";

     

       11
       11
       +
         generateHmac = cfg.hmacKeyFile == null;

     

       12
       12
       +
       

     

       10
       13
        
         serviceConfig = {

     

       11
       14
        
           systemd.services.invidious = {

     

       12
       15
        
             description = "Invidious (An alternative YouTube front-end)";

     
···

       14
       17
        
             after = [ "network-online.target" ];

     

       15
       18
        
             wantedBy = [ "multi-user.target" ];

     

       16
       19
        
       

     

       17
       17
       -
             script =

     

       18
       18
       -
               let

     

       19
       19
       -
                 jqFilter = "."

     

       20
       20
       -
                   + lib.optionalString (cfg.database.host != null) "[0].db.password = \"'\"'\"$(cat ${lib.escapeShellArg cfg.database.passwordFile})\"'\"'\""

     

       21
       21
       -
                   + " | .[0]"

     

       22
       22
       -
                   + lib.optionalString (cfg.extraSettingsFile != null) " * .[1]";

     

       23
       23
       -
                 jqFiles = [ settingsFile ] ++ lib.optional (cfg.extraSettingsFile != null) cfg.extraSettingsFile;

     

       24
       24
       -
               in

     

       25
       25
       -
               ''

     

       26
       26
       -
                 export INVIDIOUS_CONFIG="$(${pkgs.jq}/bin/jq -s "${jqFilter}" ${lib.escapeShellArgs jqFiles})"

     

       27
       27
       -
                 exec ${cfg.package}/bin/invidious

     

       28
       28
       -
               '';

     

       20
       20
       +
             preStart = lib.optionalString generateHmac ''

     

       21
       21
       +
               if [[ ! -e "${generatedHmacKeyFile}" ]]; then

     

       22
       22
       +
                 ${pkgs.pwgen}/bin/pwgen 20 1 > "${generatedHmacKeyFile}"

     

       23
       23
       +
                 chmod 0600 "${generatedHmacKeyFile}"

     

       24
       24
       +
               fi

     

       25
       25
       +
             '';

     

       26
       26
       +
       

     

       27
       27
       +
             script = ''

     

       28
       28
       +
               configParts=()

     

       29
       29
       +
             ''

     

       30
       30
       +
             # autogenerated hmac_key

     

       31
       31
       +
             + lib.optionalString generateHmac ''

     

       32
       32
       +
               configParts+=("$(${pkgs.jq}/bin/jq -R '{"hmac_key":.}' <"${generatedHmacKeyFile}")")

     

       33
       33
       +
             ''

     

       34
       34
       +
             # generated settings file

     

       35
       35
       +
             + ''

     

       36
       36
       +
               configParts+=("$(< ${lib.escapeShellArg settingsFile})")

     

       37
       37
       +
             ''

     

       38
       38
       +
             # optional database password file

     

       39
       39
       +
             + lib.optionalString (cfg.database.host != null) ''

     

       40
       40
       +
               configParts+=("$(${pkgs.jq}/bin/jq -R '{"db":{"password":.}}' ${lib.escapeShellArg cfg.database.passwordFile})")

     

       41
       41
       +
             ''

     

       42
       42
       +
             # optional extra settings file

     

       43
       43
       +
             + lib.optionalString (cfg.extraSettingsFile != null) ''

     

       44
       44
       +
               configParts+=("$(< ${lib.escapeShellArg cfg.extraSettingsFile})")

     

       45
       45
       +
             ''

     

       46
       46
       +
             # explicitly specified hmac key file

     

       47
       47
       +
             + lib.optionalString (cfg.hmacKeyFile != null) ''

     

       48
       48
       +
               configParts+=("$(< ${lib.escapeShellArg cfg.hmacKeyFile})")

     

       49
       49
       +
             ''

     

       50
       50
       +
             # merge all parts into a single configuration with later elements overriding previous elements

     

       51
       51
       +
             + ''

     

       52
       52
       +
               export INVIDIOUS_CONFIG="$(${pkgs.jq}/bin/jq -s 'reduce .[] as $item ({}; . * $item)' <<<"''${configParts[*]}")"

     

       53
       53
       +
               exec ${cfg.package}/bin/invidious

     

       54
       54
       +
             '';

     

       29
       55
        
       

     

       30
       56
        
             serviceConfig = {

     

       31
       57
        
               RestartSec = "2s";

     

       32
       58
        
               DynamicUser = true;

     

       59
       59
       +
               StateDirectory = "invidious";

     

       60
       60
       +
               StateDirectoryMode = "0750";

     

       33
       61
        
       

     

       34
       62
        
               CapabilityBoundingSet = "";

     

       35
       63
        
               PrivateDevices = true;

     
···

       168
       196
        
               The settings Invidious should use.

     

       169
       197
        
       

     

       170
       198
        
               See [config.example.yml](https://github.com/iv-org/invidious/blob/master/config/config.example.yml) for a list of all possible options.

     

       199
       199
       +
             '';

     

       200
       200
       +
           };

     

       201
       201
       +
       

     

       202
       202
       +
           hmacKeyFile = lib.mkOption {

     

       203
       203
       +
             type = types.nullOr types.path;

     

       204
       204
       +
             default = null;

     

       205
       205
       +
             description = lib.mdDoc ''

     

       206
       206
       +
               A path to a file containing the `hmac_key`. If `null`, a key will be generated automatically on first

     

       207
       207
       +
               start.

     

       208
       208
       +
       

     

       209
       209
       +
               If non-`null`, this option overrides any `hmac_key` specified in {option}`services.invidious.settings` or

     

       210
       210
       +
               via {option}`services.invidious.extraSettingsFile`.

     

       171
       211
        
             '';

     

       172
       212
        
           };

     

       173
       213

+4 -2

nixos/modules/services/x11/picom.nix

···

       61
       61
        
             '';

     

       62
       62
        
           };

     

       63
       63
        
       

     

       64
       64
       +
           package = mkPackageOptionMD pkgs "picom" { };

     

       65
       65
       +
       

     

       64
       66
        
           fade = mkOption {

     

       65
       67
        
             type = types.bool;

     

       66
       68
        
             default = false;

     
···

       301
       303
        
             };

     

       302
       304
        
       

     

       303
       305
        
             serviceConfig = {

     

       304
       304
       -
               ExecStart = "${pkgs.picom}/bin/picom --config ${configFile}";

     

       306
       306
       +
               ExecStart = "${getExe cfg.package} --config ${configFile}";

     

       305
       307
        
               RestartSec = 3;

     

       306
       308
        
               Restart = "always";

     

       307
       309
        
             };

     

       308
       310
        
           };

     

       309
       311
        
       

     

       310
       310
       -
           environment.systemPackages = [ pkgs.picom ];

     

       312
       312
       +
           environment.systemPackages = [ cfg.package ];

     

       311
       313
        
         };

     

       312
       314
        
       

     

       313
       315
        
         meta.maintainers = with lib.maintainers; [ rnhmjoj ];

+1 -1

nixos/tests/prometheus-exporters.nix

···

       1200
       1200
        
             };

     

       1201
       1201
        
             exporterTest = ''

     

       1202
       1202
        
               wait_until_succeeds(

     

       1203
       1203
       -
                   'journalctl -eu prometheus-smartctl-exporter.service -o cat | grep "Device unavailable"'

     

       1203
       1203
       +
                   'journalctl -eu prometheus-smartctl-exporter.service -o cat | grep "Unable to detect device type"'

     

       1204
       1204
        
               )

     

       1205
       1205
        
             '';

     

       1206
       1206
        
           };

+2 -2

pkgs/applications/audio/asunder/default.nix

···

       10
       10
        
       }:

     

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
       -
         version = "2.9.7";

     

       13
       13
       +
         version = "3.0.1";

     

       14
       14
        
         pname = "asunder";

     

       15
       15
        
         src = fetchurl {

     

       16
       16
        
           url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2";

     

       17
       17
       -
           sha256 = "1x3l308ss0iqhz90qyjb94gyd8b4piyrm2nzjmg5kf049k9prjf1";

     

       17
       17
       +
           sha256 = "sha256-iGji4bl7ZofIAOf2EiYqMWu4V+3TmIN2jOYottJTN2s=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ intltool makeWrapper pkg-config ];

+2 -2

pkgs/applications/audio/cava/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "cava";

     

       6
       6
       -
         version = "0.8.3";

     

       6
       6
       +
         version = "0.9.0";

     

       7
       7
        
       

     

       8
       8
        
         buildInputs = [

     

       9
       9
        
           alsa-lib

     
···

       17
       17
        
           owner = "karlstav";

     

       18
       18
        
           repo = "cava";

     

       19
       19
        
           rev = version;

     

       20
       20
       -
           sha256 = "sha256-6xiWhWynIbUWFIieiYIg24PgwnKuNSIEpkY+P6gyFGw=";

     

       20
       20
       +
           sha256 = "sha256-mIgkvgVcbRdE29lSLojIzIsnwZgnQ+B2sgScDWrLyd8=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ autoreconfHook ];

+53

pkgs/applications/audio/g4music/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitLab

     

       4
       4
       +
       , desktop-file-utils

     

       5
       5
       +
       , gobject-introspection

     

       6
       6
       +
       , gst_all_1

     

       7
       7
       +
       , gtk4

     

       8
       8
       +
       , libadwaita

     

       9
       9
       +
       , meson

     

       10
       10
       +
       , ninja

     

       11
       11
       +
       , pkg-config

     

       12
       12
       +
       , vala

     

       13
       13
       +
       , wrapGAppsHook4

     

       14
       14
       +
       }:

     

       15
       15
       +
       stdenv.mkDerivation (finalAttrs: {

     

       16
       16
       +
         pname = "g4music";

     

       17
       17
       +
         version = "3.2";

     

       18
       18
       +
       

     

       19
       19
       +
         src = fetchFromGitLab {

     

       20
       20
       +
           domain = "gitlab.gnome.org";

     

       21
       21
       +
           owner = "neithern";

     

       22
       22
       +
           repo = "g4music";

     

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

     

       24
       24
       +
           hash = "sha256-BlHOYD4sOmJPNMzM5QA97Ah1N9tIat0Y6qxN6c5pmsw=";

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         nativeBuildInputs = [

     

       28
       28
       +
           desktop-file-utils

     

       29
       29
       +
           gobject-introspection

     

       30
       30
       +
           meson

     

       31
       31
       +
           ninja

     

       32
       32
       +
           pkg-config

     

       33
       33
       +
           vala

     

       34
       34
       +
           wrapGAppsHook4

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       37
       37
       +
         buildInputs = [

     

       38
       38
       +
           gtk4

     

       39
       39
       +
           libadwaita

     

       40
       40
       +
         ] ++ (with gst_all_1; [

     

       41
       41
       +
           gst-plugins-base

     

       42
       42
       +
           gst-plugins-good

     

       43
       43
       +
           gstreamer

     

       44
       44
       +
         ]);

     

       45
       45
       +
       

     

       46
       46
       +
         meta = with lib; {

     

       47
       47
       +
           description = "A beautiful, fast, fluent, light weight music player written in GTK4";

     

       48
       48
       +
           homepage = "https://gitlab.gnome.org/neithern/g4music";

     

       49
       49
       +
           license = licenses.gpl3Only;

     

       50
       50
       +
           maintainers = with maintainers; [ magnouvean ];

     

       51
       51
       +
           platforms = platforms.linux;

     

       52
       52
       +
         };

     

       53
       53
       +
       })

+2 -2

pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix

···

       17
       17
        
       

     

       18
       18
        
         cask = callPackage ./manual-packages/cask { };

     

       19
       19
        
       

     

       20
       20
       +
         consult-gh = callPackage ./manual-packages/consult-gh { };

     

       21
       21
       +
       

     

       20
       22
        
         control-lock = callPackage ./manual-packages/control-lock { };

     

       21
       23
        
       

     

       22
       24
        
         ebuild-mode = callPackage ./manual-packages/ebuild-mode { };

     
···

       64
       66
        
         perl-completion = callPackage ./manual-packages/perl-completion { };

     

       65
       67
        
       

     

       66
       68
        
         pod-mode = callPackage ./manual-packages/pod-mode { };

     

       67
       67
       -
       

     

       68
       68
       -
         power-mode = callPackage ./manual-packages/power-mode { };

     

       69
       69
        
       

     

       70
       70
        
         prisma-mode = callPackage ./manual-packages/prisma-mode { };

     

       71
       71

+52

pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , melpaBuild

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , consult

     

       5
       5
       +
       , embark

     

       6
       6
       +
       , forge

     

       7
       7
       +
       , gh

     

       8
       8
       +
       , markdown-mode

     

       9
       9
       +
       , writeText

     

       10
       10
       +
       , unstableGitUpdater

     

       11
       11
       +
       }:

     

       12
       12
       +
       

     

       13
       13
       +
       let

     

       14
       14
       +
         commit = "1fe876d9552b6ec6af257a4299a34eca99b40539";

     

       15
       15
       +
       in

     

       16
       16
       +
       melpaBuild {

     

       17
       17
       +
         pname = "consult-gh";

     

       18
       18
       +
         version = "20230706.438";

     

       19
       19
       +
       

     

       20
       20
       +
         inherit commit;

     

       21
       21
       +
       

     

       22
       22
       +
         src = fetchFromGitHub {

     

       23
       23
       +
           owner = "armindarvish";

     

       24
       24
       +
           repo = "consult-gh";

     

       25
       25
       +
           rev = commit;

     

       26
       26
       +
           hash = "sha256-bi+qlNvNMXbS4cXbXt01txwD2NAyAqJGNKeOtdtj7tg=";

     

       27
       27
       +
         };

     

       28
       28
       +
       

     

       29
       29
       +
         packageRequires = [

     

       30
       30
       +
           consult

     

       31
       31
       +
           embark

     

       32
       32
       +
           forge

     

       33
       33
       +
           gh

     

       34
       34
       +
           markdown-mode

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       37
       37
       +
         recipe = writeText "recipe" ''

     

       38
       38
       +
           (consult-gh

     

       39
       39
       +
             :repo "armindarvish/consult-gh"

     

       40
       40
       +
             :fetcher github

     

       41
       41
       +
             :files ("consult-gh-embark.el" "consult-gh-forge.el" "consult-gh.el"))

     

       42
       42
       +
         '';

     

       43
       43
       +
       

     

       44
       44
       +
         passthru.updateScript = unstableGitUpdater { };

     

       45
       45
       +
       

     

       46
       46
       +
         meta = {

     

       47
       47
       +
           homepage = "https://github.com/armindarvish/consult-gh";

     

       48
       48
       +
           description = "A GitHub CLI client inside GNU Emacs using Consult";

     

       49
       49
       +
           license = lib.licenses.gpl3Only;

     

       50
       50
       +
           maintainers = with lib.maintainers; [ AndersonTorres ];

     

       51
       51
       +
         };

     

       52
       52
       +
       }

-22

pkgs/applications/editors/emacs/elisp-packages/manual-packages/power-mode/default.nix

···

       1
       1
       -
       { trivialBuild

     

       2
       2
       -
       , fetchFromGitHub

     

       3
       3
       -
       , emacs

     

       4
       4
       -
       }:

     

       5
       5
       -
       

     

       6
       6
       -
       trivialBuild rec {

     

       7
       7
       -
         pname = "power-mode";

     

       8
       8
       -
         version = "0.pre+unstable=2021-06-06";

     

       9
       9
       -
       

     

       10
       10
       -
         src = fetchFromGitHub {

     

       11
       11
       -
           owner = "elizagamedev";

     

       12
       12
       -
           repo  = "power-mode.el";

     

       13
       13
       -
           rev = "940e0aa36220f863e8f43840b4ed634b464fbdbb";

     

       14
       14
       -
           hash = "sha256-Wy8o9QTWqvH9cP7xsTpF5QSd4mWNIPXJTadoADKeHWY=";

     

       15
       15
       -
         };

     

       16
       16
       -
       

     

       17
       17
       -
         meta = {

     

       18
       18
       -
           homepage = "https://github.com/elizagamedev/power-mode.el";

     

       19
       19
       -
           description = "Imbue Emacs with power!";

     

       20
       20
       -
           inherit (emacs.meta) platforms;

     

       21
       21
       -
         };

     

       22
       22
       -
       }

+2 -2

pkgs/applications/editors/texstudio/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation (finalAttrs: {

     

       6
       6
        
         pname = "texstudio";

     

       7
       7
       -
         version = "4.6.2";

     

       7
       7
       +
         version = "4.6.3";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "texstudio-org";

     

       11
       11
        
           repo = "texstudio";

     

       12
       12
        
           rev = finalAttrs.version;

     

       13
       13
       -
           hash = "sha256-2bvKB/8HcZoTk2J6FQXXJREqGp6EZ95C2Aqcx9o/eho=";

     

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

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [

+6 -6

pkgs/applications/emulators/ccemux/default.nix

···

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
         version = "1.1.1";

     

       7
       7
       -
         rev = "af12e2e4da586275ba931eae8f40a2201251bf59";

     

       6
       6
       +
         version = "unstable-2023-07-08";

     

       7
       7
       +
         rev = "989cfe52a0458b991e0a7d87edec81d3fef472ac";

     

       8
       8
        
       

     

       9
       9
        
         baseUrl = "https://emux.cc/versions/${lib.substring 0 8 rev}/CCEmuX";

     

       10
       10
        
         jar =

     

       11
       11
        
           if useCCTweaked

     

       12
       12
        
           then fetchurl {

     

       13
       13
        
             url = "${baseUrl}-cct.jar";

     

       14
       14
       -
             sha256 = "0d9gzi1h5vz32fp4lfn7dam189jcm7bwbqwmlpj0c47p8l0d4lsv";

     

       14
       14
       +
             hash = "sha256-B9Zan6wpYnUtaNbUIrXvkchPiEquMs9R2Kiqg85/VdY=";

     

       15
       15
        
           }

     

       16
       16
        
           else fetchurl {

     

       17
       17
        
             url = "${baseUrl}-cc.jar";

     

       18
       18
       -
             sha256 = "0ky5vxh8m1v98zllifxif8xxd25j2xdp19hjnj4xlkck71lbnb34";

     

       18
       18
       +
             hash = "sha256-2Z38O6z7OrHKe8GdLnexin749uJzQaCZglS+SwVD5YE=";

     

       19
       19
        
           };

     

       20
       20
        
       

     

       21
       21
        
         desktopIcon = fetchurl {

     

       22
       22
        
           url = "https://github.com/CCEmuX/CCEmuX/raw/${rev}/src/main/resources/img/icon.png";

     

       23
       23
       -
           sha256 = "1vmb6rg9k2y99j8xqfgbsvfgfi3g985rmqwrd7w3y54ffr2r99c2";

     

       23
       23
       +
           hash = "sha256-gqWURXaOFD/4aZnjmgtKb0T33NbrOdyRTMmLmV42q+4=";

     

       24
       24
        
         };

     

       25
       25
        
         desktopItem =  makeDesktopItem {

     

       26
       26
        
           name = "CCEmuX";

     
···

       63
       63
        
           homepage = "https://github.com/CCEmuX/CCEmuX";

     

       64
       64
        
           sourceProvenance = with sourceTypes; [ binaryBytecode ];

     

       65
       65
        
           license = licenses.mit;

     

       66
       66
       -
           maintainers = with maintainers; [ CrazedProgrammer ];

     

       66
       66
       +
           maintainers = with maintainers; [ CrazedProgrammer viluon ];

     

       67
       67
        
         };

     

       68
       68
        
       }

+3 -3

pkgs/applications/emulators/ryujinx/default.nix

···

       28
       28
        
       

     

       29
       29
        
       buildDotnetModule rec {

     

       30
       30
        
         pname = "ryujinx";

     

       31
       31
       -
         version = "1.1.974"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml

     

       31
       31
       +
         version = "1.1.986"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml

     

       32
       32
        
       

     

       33
       33
        
         src = fetchFromGitHub {

     

       34
       34
        
           owner = "Ryujinx";

     

       35
       35
        
           repo = "Ryujinx";

     

       36
       36
       -
           rev = "5a0aa074b661753d8f0202a73d9f6f3ac6e2ab11";

     

       37
       37
       -
           sha256 = "0f1wivwf7hnsqi7sgqjrikxvakrk8dmywpmyd36a3s5lbk878wp3";

     

       36
       36
       +
           rev = "33f544fd9248361440afd6013e0ef9d69971d6da";

     

       37
       37
       +
           sha256 = "1cnz3j8qndfrm1iifbzswyf4vcii939naj29bvr2mp6bdwrbqi49";

     

       38
       38
        
         };

     

       39
       39
        
       

     

       40
       40
        
         dotnet-sdk = dotnetCorePackages.sdk_7_0;

+51 -51

pkgs/applications/emulators/ryujinx/deps.nix

···

       2
       2
        
       # Please dont edit it manually, your changes might get overwritten!

     

       3
       3
        
       

     

       4
       4
        
       { fetchNuGet }: [

     

       5
       5
       -
         (fetchNuGet { pname = "Avalonia"; version = "0.10.21"; sha256 = "1x6z0wvlg5ww6n7idj2pwc6mxd7k9xsb7vh3v0z4in3rck0vwz95"; })

     

       6
       6
       -
         (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; })

     

       7
       7
       -
         (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.16"; sha256 = "11v3a4kda04jacznl7j8fc9zw16ysajwc3ljmdribbqz1rrr823v"; })

     

       8
       8
       -
         (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.21"; sha256 = "0rx9qni3m1zhv6n73kskgj7vd6fxsalg84i2202gz53m11li7yvj"; })

     

       9
       9
       -
         (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.21"; sha256 = "0jjx8lfbzqznqv7xpkfi8xvygqcqfk8wzkj9ambq30cn4h1ids05"; })

     

       10
       10
       -
         (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.21"; sha256 = "10fl0nb8lhpvms1apb3mmswrpirc2j8vr78jvb63cni0885vxhab"; })

     

       11
       11
       -
         (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.21"; sha256 = "038i1vim97niyh9qf5b1lbrakc8r7m03nk1yqn3iv563q8zbwfq7"; })

     

       12
       12
       -
         (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.21"; sha256 = "0p0jz3za6y708fp0wpbjyqivfp6979ldwx8r95nmdmh10fm9q4yi"; })

     

       13
       13
       -
         (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.21"; sha256 = "08f17zb0dq7p7naz96il15lhbrzan4897wghkl8rrd80dw0bhbb2"; })

     

       14
       14
       -
         (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.21"; sha256 = "03ca99awvp178jsndy5zlsc17rlx29iz0x2jvj85fh6qdvds2dhj"; })

     

       15
       15
       -
         (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.18"; sha256 = "1vi83d9q6m2zd7b5snyzjxsj3vdp5bmi5vqhfslzghslpbhj2zwv"; })

     

       16
       16
       -
         (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.21"; sha256 = "0fja6rv0gw5kjiz0vpnyv5lv8xz5gzd71wz0052x9mrgq3jz00p8"; })

     

       17
       17
       -
         (fetchNuGet { pname = "Avalonia.Svg"; version = "0.10.18"; sha256 = "06h7yh2lkm4rqfchn7nxqjbqx4afh42w61z9sby7b5gj56h5a84q"; })

     

       18
       18
       -
         (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "0.10.18"; sha256 = "0s25aq3xz0km55jwdxp59z8cc0d1zqaag1hiwnxdzd30id2ahn66"; })

     

       19
       19
       -
         (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.21"; sha256 = "0ichldyigbsd82jrryq340bqlh7jw9zr850fyni2g3h0bbcx5327"; })

     

       20
       20
       -
         (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.21"; sha256 = "08vbdiv2k9vp8gp59rk0z63jyn8hlv8a4956jczy05ail5qfl94v"; })

     

       5
       5
       +
         (fetchNuGet { pname = "Avalonia"; version = "11.0.3"; sha256 = "1ig635386glxgfv9l894dqp98l93ymsylml649xm42lc9a9f1khc"; })

     

       6
       6
       +
         (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; })

     

       7
       7
       +
         (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; })

     

       8
       8
       +
         (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0"; sha256 = "06wgzhxkivlaxkn8p61wainsprml2g1q4jmvy9fpn64qnfywjdn7"; })

     

       9
       9
       +
         (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.3"; sha256 = "0xcxwc588lc2ify2d3m53pmwjgf7p9lwz5q11hn8p5c9zh01iai9"; })

     

       10
       10
       +
         (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.3"; sha256 = "1kls0v2rjimcv7k0dvqd3l694xdg9nf8wdzcz1cadi4qvj0bx7l4"; })

     

       11
       11
       +
         (fetchNuGet { pname = "Avalonia.Controls.ItemsRepeater"; version = "11.0.0"; sha256 = "1qxw096av0n4ks0jixh7xxrzgsn9fshp1ypy3vvij7r0a1sk7y1q"; })

     

       12
       12
       +
         (fetchNuGet { pname = "Avalonia.Controls.ItemsRepeater"; version = "11.0.0-rc2.1"; sha256 = "0pmc0fi2abn9qaqwx9lvqnd1a5a8lzp8zin72d3k3xjsh1w1g0n8"; })

     

       13
       13
       +
         (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.3"; sha256 = "0g8hzvkf2rrfnpmm56m2miwpdw14l04rr0q8xz03j220fy9xk5fm"; })

     

       14
       14
       +
         (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.3"; sha256 = "1rificg9ikf8m2550ylrqavkkvihf8xb22agmdrbz07v7s93v731"; })

     

       15
       15
       +
         (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.3"; sha256 = "0w8qc45phfz4mnnx1mfxi042qmq31shmjmz5inb4maw9xha0yr3c"; })

     

       16
       16
       +
         (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "11.0.3"; sha256 = "09g4flx6sg2b2mkwbqrwl51q87xzy0d43j2xjxvnwc8vwhr1h8gs"; })

     

       17
       17
       +
         (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.3"; sha256 = "1gi3y2cdfcjkwjldavahyx09a1n91jpvx8szwrfgr3kk4ycc5lyn"; })

     

       18
       18
       +
         (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0"; sha256 = "1b5031k8slwiz7bncih67fjl6ny234yd4skqxk611l9zp5snjic2"; })

     

       19
       19
       +
         (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.3"; sha256 = "0syh20a6892pip4qz32kgc5w77ig40yjgwbcknivhjr8arc3126r"; })

     

       20
       20
       +
         (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0"; sha256 = "1ra1kd0kkblppr5zy7rzdbwllggrzvp9lkxblf9mg3y8rnp6fk83"; })

     

       21
       21
       +
         (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.3"; sha256 = "0089z8ml8pblq6hispj1nf7lvf6zplrrlix22jcd87pm13232pg2"; })

     

       22
       22
       +
         (fetchNuGet { pname = "Avalonia.Svg"; version = "11.0.0"; sha256 = "1xmgaj2wnjdl16x4y6rmfp3q9faca5na90zlb8j62rxcwf1v3lkr"; })

     

       23
       23
       +
         (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.0.0"; sha256 = "0cd8w9pm7lpifdzjmsnmjlzdqgq3qw653mcj3adczb5ycqqbd8p3"; })

     

       24
       24
       +
         (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.3"; sha256 = "0zkm0asxcbsybswxs0p6ybsiq6j1l1j02h0xfxzsmhcimm3y92kk"; })

     

       25
       25
       +
         (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.3"; sha256 = "14pj98057fmfgafq0pni7pw79ls0lsf3jaydfjmdjyw5x2b2x51q"; })

     

       26
       26
       +
         (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.3"; sha256 = "0pb41fpiwndcf34r53apxf92qgqxavc4zfl1xy847pz3kj1vsclp"; })

     

       21
       27
        
         (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; })

     

       22
       28
        
         (fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; })

     

       23
       29
        
         (fetchNuGet { pname = "DiscordRichPresence"; version = "1.2.1.24"; sha256 = "0maw0yd6xgwy0cgk593z3zva0r5j267zpdmmpq8avj3zbna6n4x1"; })

     

       24
       30
        
         (fetchNuGet { pname = "DynamicData"; version = "7.14.2"; sha256 = "07k79w4702masq71rk865mi3h1kaxamyp7dgl08ny4n22gg8482k"; })

     

       25
       31
        
         (fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; })

     

       26
       32
        
         (fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; })

     

       27
       27
       -
         (fetchNuGet { pname = "FluentAvaloniaUI"; version = "1.4.5"; sha256 = "1j5ivy83f13dgn09qrfkq44ijvh0m9rbdx8760g47di70c4lda7j"; })

     

       33
       33
       +
         (fetchNuGet { pname = "FluentAvaloniaUI"; version = "2.0.1"; sha256 = "12w6rk3qgn6i2zk06appf98pgdf89pw10865qcwn5xpjwm7487k2"; })

     

       28
       34
        
         (fetchNuGet { pname = "FSharp.Core"; version = "7.0.200"; sha256 = "1ji816r8idwjmxk8bzyq1z32ybz7xdg3nb0a7pnvqr8vys11bkgb"; })

     

       29
       35
        
         (fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.1"; sha256 = "0ffywnc3ca1lwhxdnk99l238vsprsrsh678bgm238lb7ja7m52pw"; })

     

       30
       30
       -
         (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.1-preview.108"; sha256 = "0xs4px4fy5b6glc77rqswzpi5ddhxvbar1md6q9wla7hckabnq0z"; })

     

       31
       31
       -
         (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.1-preview.108"; sha256 = "16wvgvyra2g1b38rxxgkk85wbz89hspixs54zfcm4racgmj1mrj4"; })

     

       32
       32
       -
         (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.1-preview.108"; sha256 = "16v7lrwwif2f5zfkx08n6y6w3m56mh4hy757biv0w9yffaf200js"; })

     

       33
       33
       -
         (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.1-preview.108"; sha256 = "15kqb353snwpavz3jja63mq8xjqsrw1f902scm8wxmsqrm5q6x55"; })

     

       34
       34
       -
         (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; })

     

       35
       35
       -
         (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; })

     

       36
       36
       -
         (fetchNuGet { pname = "jp2masa.Avalonia.Flexbox"; version = "0.2.0"; sha256 = "1abck2gad29mgf9gwqgc6wr8iwl64v50n0sbxcj1bcxgkgndraiq"; })

     

       36
       36
       +
         (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; })

     

       37
       37
       +
         (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; })

     

       38
       38
       +
         (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; })

     

       39
       39
       +
         (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; })

     

       40
       40
       +
         (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; })

     

       41
       41
       +
         (fetchNuGet { pname = "jp2masa.Avalonia.Flexbox"; version = "0.3.0-beta.4"; sha256 = "17847ssn15l755zmspvb69wsfbj9ayvy9xl8zgjx6wvvwp6x89cp"; })

     

       37
       42
        
         (fetchNuGet { pname = "LibHac"; version = "0.18.0"; sha256 = "19d5fqdcws0730580jlda6pdddprxcrhw7b3ybiiglabsr7bmgdv"; })

     

       38
       38
       -
         (fetchNuGet { pname = "MicroCom.CodeGenerator.MSBuild"; version = "0.10.4"; sha256 = "1bdgy6g15d1mln1xpvs6sy0l2zvfs4hxw6nc3qm16qb8hdgvb73y"; })

     

       39
       39
       -
         (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.10.4"; sha256 = "0ccbzp0d01dcahm7ban7xyh1rk7k2pkml3l5i7s85cqk5lnczpw2"; })

     

       40
       40
       -
         (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.6"; sha256 = "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a"; })

     

       43
       43
       +
         (fetchNuGet { pname = "MicroCom.CodeGenerator.MSBuild"; version = "0.11.0"; sha256 = "0ynvaq3faqh4pirl0l8l6xq2ikk3f27xw05i8vm3vwamgy4p7k2f"; })

     

       44
       44
       +
         (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; })

     

       45
       45
       +
         (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; })

     

       41
       46
        
         (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; sha256 = "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"; })

     

       42
       42
       -
         (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.4.0"; sha256 = "12rn6gl4viycwk3pz5hp5df63g66zvba4hnkwr3f0876jj5ivmsw"; })

     

       47
       47
       +
         (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; })

     

       43
       48
        
         (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.6.0"; sha256 = "0qvkwkbqz4dhkxsisanax1lwm3nzyyb4kgb40qczxbl8g251cjp2"; })

     

       44
       44
       -
         (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.4.0"; sha256 = "0rhylcwa95bxawcgixk64knv7p7xrykdjcabmx3gknk8hvj1ai9y"; })

     

       49
       49
       +
         (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; })

     

       45
       50
        
         (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.6.0"; sha256 = "1yfvwygx795c9lswpiv8q19zydifarzljdmvv67vjmi559cm8b1q"; })

     

       46
       46
       -
         (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.4.0"; sha256 = "1h2f0z9xnw987x8bydka1sd42ijqjx973md6v1gvpy1qc6ad244g"; })

     

       47
       47
       -
         (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.4.0"; sha256 = "195gqnpwqkg2wlvk8x6yzm7byrxfq9bki20xmhf6lzfsdw3z4mf2"; })

     

       51
       51
       +
         (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; })

     

       52
       52
       +
         (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; })

     

       48
       53
        
         (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.3"; sha256 = "1xxzd2yxlbq2h4k6flp7lvffmmwrjlyha2z1yvrxxymiyyggk2zg"; })

     

       49
       54
        
         (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; })

     

       50
       55
        
         (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; })

     
···

       136
       141
        
         (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.28.1-build28"; sha256 = "0kn7f6cgvb2rsybiif6g7xkw1srmfr306zpv029lvi264dv6aj6l"; })

     

       137
       142
        
         (fetchNuGet { pname = "shaderc.net"; version = "0.1.0"; sha256 = "0f35s9h0vj9f1rx9bssj66hibc3j9bzrb4wgb5q2jwkf5xncxbpq"; })

     

       138
       143
        
         (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; })

     

       139
       139
       -
         (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.18"; sha256 = "1i97f2zbsm8vhcbcfj6g4ml6g261gijdh7s3rmvwvxgfha6qyvkg"; })

     

       144
       144
       +
         (fetchNuGet { pname = "ShimSkiaSharp"; version = "1.0.0"; sha256 = "0gdsrzh8q8mxlm7sxvai7zshaz93a3dm1ha4cgs4845lfhpn8nhc"; })

     

       140
       145
        
         (fetchNuGet { pname = "Silk.NET.Core"; version = "2.16.0"; sha256 = "1mkqc2aicvknmpyfry2v7jjxh3apaxa6dmk1vfbwxnkysl417x0k"; })

     

       141
       146
        
         (fetchNuGet { pname = "Silk.NET.Vulkan"; version = "2.16.0"; sha256 = "0sg5mxv7ga5pq6wc0lz52j07fxrcfmb0an30r4cxsxk66298z2wy"; })

     

       142
       147
        
         (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.EXT"; version = "2.16.0"; sha256 = "05918f6fl8byla2m7qjp7dvxww2rbpj2sqd4xq26rl885fmddfvf"; })

     
···

       144
       149
        
         (fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0-beta0013"; sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql"; })

     

       145
       150
        
         (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "1.0.4"; sha256 = "0fmgn414my76gjgp89qlc210a0lqvnvkvk2fcwnpwxdhqpfvyilr"; })

     

       146
       151
        
         (fetchNuGet { pname = "SixLabors.ImageSharp.Drawing"; version = "1.0.0-beta11"; sha256 = "0hl0rs3kr1zdnx3gdssxgli6fyvmwzcfp99f4db71s0i8j8b2bp5"; })

     

       147
       147
       -
         (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.108"; sha256 = "01sm36hdgmcgkai9m09xn2qfz8v7xhh803n8fng8rlxwnw60rgg6"; })

     

       148
       148
       -
         (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.1-preview.108"; sha256 = "1hjscqn2kfgvn367drxzwssj5f5arn919x6clywbbf2dhggcdnn5"; })

     

       149
       149
       -
         (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.108"; sha256 = "19jf2jcq2spwbpx3cfdi2a95jf4y8205rh56lmkh8zsxd2k7fjyp"; })

     

       150
       150
       -
         (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.108"; sha256 = "1vcpqd7slh2b9gsacpd7mk1266r1xfnkm6230k8chl3ng19qlf15"; })

     

       151
       151
       -
         (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.108"; sha256 = "0a89gqjw8k97arr0kyd0fm3f46k1qamksbnyns9xdlgydjg557dd"; })

     

       152
       152
       -
         (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.108"; sha256 = "05g9blprq5msw3wshrgsk19y0fvhjlqiybs1vdyhfmww330jlypn"; })

     

       152
       152
       +
         (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; })

     

       153
       153
       +
         (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.3"; sha256 = "0axz2zfyg0h3zis7rr86ikrm2jbxxy0gqb3bbawpgynf1k0fsi6a"; })

     

       154
       154
       +
         (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; })

     

       155
       155
       +
         (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; })

     

       156
       156
       +
         (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; sha256 = "1w5njksq3amrrp7fqxw89nv6ar2kgc5yx092i4rxv7hrjbd1aagx"; })

     

       157
       157
       +
         (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; })

     

       153
       158
        
         (fetchNuGet { pname = "SPB"; version = "0.0.4-build28"; sha256 = "1ran6qwzlkv6xpvnp7n0nkva0zfrzwlcxj7zfzz9v8mpicqs297x"; })

     

       154
       154
       -
         (fetchNuGet { pname = "Svg.Custom"; version = "0.5.18"; sha256 = "0x68cs525k7c2dvj3vhjhx7bcls600xlsjkhfi7xvj0621masxa4"; })

     

       155
       155
       -
         (fetchNuGet { pname = "Svg.Model"; version = "0.5.18"; sha256 = "1pqqaphdsjv4w9qlzb2i0kf0aas8778nlb4nysyiy5rdvpp7zzng"; })

     

       156
       156
       -
         (fetchNuGet { pname = "Svg.Skia"; version = "0.5.18"; sha256 = "0j1n096d49gd53j6zzngf5v81dnrdzaa4rx7fpmk8zp1xz2wjb2j"; })

     

       159
       159
       +
         (fetchNuGet { pname = "Svg.Custom"; version = "1.0.0"; sha256 = "0bmvgaqy4iaxw9x88ifx3a2zz0vw3p9w6pj4bk3xfnf5p9vjx1mr"; })

     

       160
       160
       +
         (fetchNuGet { pname = "Svg.Model"; version = "1.0.0"; sha256 = "0yrjcqcrlgqpdm3bi59nc3fppcqgrfc7jddjwxjj2q423gimip97"; })

     

       161
       161
       +
         (fetchNuGet { pname = "Svg.Skia"; version = "1.0.0"; sha256 = "1bs2l9fjiqpip4qh0aw7x8f8m0ja0xlcj5vwd329knkww2jx1d3c"; })

     

       157
       162
        
         (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; })

     

       158
       163
        
         (fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; })

     

       159
       164
        
         (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; })

     
···

       163
       168
        
         (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; })

     

       164
       169
        
         (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })

     

       165
       170
        
         (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; })

     

       166
       166
       -
         (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; })

     

       171
       171
       +
         (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; })

     

       167
       172
        
         (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; })

     

       168
       173
        
         (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; })

     

       169
       174
        
         (fetchNuGet { pname = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; })

     
···

       186
       191
        
         (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; })

     

       187
       192
        
         (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; })

     

       188
       193
        
         (fetchNuGet { pname = "System.IO.Hashing"; version = "7.0.0"; sha256 = "0vilmb817wnw8w13kkps831p05zzc41dldigpbr3wqi0hsrf8ad9"; })

     

       194
       194
       +
         (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; })

     

       189
       195
        
         (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; })

     

       190
       196
        
         (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })

     

       191
       197
        
         (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; })

     

       192
       198
        
         (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; })

     

       193
       199
        
         (fetchNuGet { pname = "System.Management"; version = "7.0.2"; sha256 = "0mjdkzl459hnz0qg4m0xp2kwizsqgdc9vc3xk7y7cv0znhhbb7bc"; })

     

       194
       194
       -
         (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; })

     

       195
       200
        
         (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; })

     

       196
       201
        
         (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; })

     

       197
       202
        
         (fetchNuGet { pname = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; })

     
···

       204
       209
        
         (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; })

     

       205
       210
        
         (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; })

     

       206
       211
        
         (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; })

     

       207
       207
       -
         (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; })

     

       208
       212
        
         (fetchNuGet { pname = "System.Reactive"; version = "6.0.0"; sha256 = "1mkvx1fwychpczksy6svfmniqhbm3xqblxqik6178l12xgq7aw45"; })

     

       209
       213
        
         (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; })

     

       210
       214
        
         (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; })

     

       211
       215
        
         (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; })

     

       212
       216
        
         (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; })

     

       213
       213
       -
         (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; })

     

       214
       217
        
         (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; })

     

       215
       218
        
         (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; })

     

       216
       219
        
         (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; })

     
···

       218
       221
        
         (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; })

     

       219
       222
        
         (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; })

     

       220
       223
        
         (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; })

     

       224
       224
       +
         (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; })

     

       221
       225
        
         (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; sha256 = "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v"; })

     

       222
       226
        
         (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; })

     

       223
       227
        
         (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; })

     
···

       227
       231
        
         (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; })

     

       228
       232
        
         (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; })

     

       229
       233
        
         (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })

     

       230
       230
       -
         (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; })

     

       231
       231
       -
         (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; })

     

       232
       234
        
         (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; })

     

       235
       235
       +
         (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; })

     

       233
       236
        
         (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; })

     

       234
       237
        
         (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; })

     

       235
       238
        
         (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; })

     
···

       253
       256
        
         (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; })

     

       254
       257
        
         (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; })

     

       255
       258
        
         (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; })

     

       256
       256
       -
         (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; })

     

       257
       259
        
         (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; })

     

       258
       260
        
         (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })

     

       259
       261
        
         (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; })

     
···

       269
       271
        
         (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; })

     

       270
       272
        
         (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })

     

       271
       273
        
         (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; })

     

       272
       272
       -
         (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; })

     

       273
       274
        
         (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; })

     

       274
       275
        
         (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; })

     

       275
       276
        
         (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; })

     

       276
       277
        
         (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; })

     

       277
       278
        
         (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; })

     

       278
       279
        
         (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; })

     

       279
       279
       -
         (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; })

     

       280
       280
       +
         (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; })

     

       280
       281
        
         (fetchNuGet { pname = "UnicornEngine.Unicorn"; version = "2.0.2-rc1-fb78016"; sha256 = "1r43b5fd5q8xq8b5nk11jsz2gnm96dh7sxc0rrv2p605ivz7icin"; })

     

       281
       281
       -
         (fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.6.1"; sha256 = "0348gj9g5rl0pj2frx4vscj6602gfyn9ba3i1rmfcrxh9jwwa09m"; })

     

       282
       282
        
       ]

+2 -2

pkgs/applications/misc/gpsprune/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "gpsprune";

     

       5
       5
       -
         version = "22.2";

     

       5
       5
       +
         version = "23.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";

     

       9
       9
       -
           sha256 = "sha256-7T7UmS650VvYN29vQxemzsaxF5wPFF+yCNCTyXY7nmY=";

     

       9
       9
       +
           sha256 = "sha256-0Lf/GuqlovVbnk3jSJHFGF688GXABcSVLr1hATaIomk=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         dontUnpack = true;

+5 -5

pkgs/applications/misc/waybar/default.nix

···

       38
       38
        
       let

     

       39
       39
        
         # Derived from subprojects/cava.wrap

     

       40
       40
        
         libcava = rec {

     

       41
       41
       -
           version = "0.8.4";

     

       41
       41
       +
           version = "0.8.5";

     

       42
       42
        
           src = fetchFromGitHub {

     

       43
       43
        
             owner = "LukashonakV";

     

       44
       44
        
             repo = "cava";

     

       45
       45
        
             rev = version;

     

       46
       46
       -
             hash = "sha256-66uc0CEriV9XOjSjFTt+bxghEXY1OGrpjd+7d6piJUI=";

     

       46
       46
       +
             hash = "sha256-b/XfqLh8PnW018sGVKRRlFvBpo2Ru1R2lUeTR7pugBo=";

     

       47
       47
        
           };

     

       48
       48
        
         };

     

       49
       49
        
       in

     

       50
       50
        
       stdenv.mkDerivation rec {

     

       51
       51
        
         pname = "waybar";

     

       52
       52
       -
         version = "0.9.20";

     

       52
       52
       +
         version = "0.9.21";

     

       53
       53
        
       

     

       54
       54
        
         src = fetchFromGitHub {

     

       55
       55
        
           owner = "Alexays";

     

       56
       56
        
           repo = "Waybar";

     

       57
       57
        
           rev = version;

     

       58
       58
       -
           hash = "sha256-xLcoysnCPB9+jI5cZokWWIvXM5wo3eXOe/hXfuChBR4=";

     

       58
       58
       +
           hash = "sha256-VvQTRo2MuJ475lKrExVhzi74fb1wAw0gHD1v4rcWIDk=";

     

       59
       59
        
         };

     

       60
       60
        
       

     

       61
       61
        
         postUnpack = lib.optional cavaSupport ''

     

       62
       62
        
           (

     

       63
       63
        
             cd "$sourceRoot"

     

       64
       64
       -
             cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.8.4

     

       64
       64
       +
             cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.8.5

     

       65
       65
        
             patchShebangs .

     

       66
       66
        
           )

     

       67
       67
        
         '';

+2 -2

pkgs/applications/networking/appgate-sdp/default.nix

···

       86
       86
        
       in

     

       87
       87
        
       stdenv.mkDerivation rec {

     

       88
       88
        
         pname = "appgate-sdp";

     

       89
       89
       -
         version = "6.2.0";

     

       89
       89
       +
         version = "6.2.1";

     

       90
       90
        
       

     

       91
       91
        
         src = fetchurl {

     

       92
       92
        
           url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb";

     

       93
       93
       -
           sha256 = "sha256-qs4hrhQGPMYfhz95y8lNECcDGbsvypVN5DPSKsHhiFs=";

     

       93
       93
       +
           sha256 = "sha256-TjwVUBSBYo67lJyTXeee1bSaCnYLGE/MKSt+YEV+/Hw=";

     

       94
       94
        
         };

     

       95
       95
        
       

     

       96
       96
        
         # just patch interpreter

+23

pkgs/applications/networking/cluster/kubectl-klock/default.nix

···

       1
       1
       +
       { lib, buildGoModule, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildGoModule rec {

     

       4
       4
       +
         pname = "kubectl-klock";

     

       5
       5
       +
         version = "0.3.1";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "jillejr";

     

       9
       9
       +
           repo = pname;

     

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

     

       11
       11
       +
           sha256 = "sha256-zOdi2QUVvRPPiI22bm7Z5OeShslysjcnvkhroOjbZrU=";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         vendorSha256 = "sha256-r4oAmD/7CXYiWEWR/FC/Ab0LNxehWv6oCWjQ/fGU2rU=";

     

       15
       15
       +
       

     

       16
       16
       +
         meta = with lib; {

     

       17
       17
       +
           description = "A kubectl plugin to render watch output in a more readable fashion";

     

       18
       18
       +
           homepage = "https://github.com/jillejr/kubectl-klock";

     

       19
       19
       +
           changelog = "https://github.com/jillejr/kubectl-klock/releases/tag/v${version}";

     

       20
       20
       +
           license = licenses.gpl3Plus;

     

       21
       21
       +
           maintainers = [ maintainers.scm2342 ];

     

       22
       22
       +
         };

     

       23
       23
       +
       }

+3 -3

pkgs/applications/networking/cluster/pachyderm/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "pachyderm";

     

       5
       5
       -
         version = "2.6.8";

     

       5
       5
       +
         version = "2.7.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "pachyderm";

     

       9
       9
        
           repo = "pachyderm";

     

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

     

       11
       11
       -
           hash = "sha256-2AD/JGdcJV8qYH/k3gR9YgLsMcyKtWJmqQN29NUsE4Y=";

     

       11
       11
       +
           hash = "sha256-OA6NY8hI/Aw6vdtDfN1cRXdsLLfxW5ECg5tobPZB66Y=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorHash = "sha256-3EG9d4ERaWuHaKFt0KFCOKIgTdrL7HZTO+GSi2RROKY=";

     

       14
       14
       +
         vendorHash = "sha256-q8Cx+J5BjMvO5wuvH5Tc5Oa9rjW7vXvS4DhSVv/E3E4=";

     

       15
       15
        
       

     

       16
       16
        
         subPackages = [ "src/server/cmd/pachctl" ];

     

       17
       17

+18 -18

pkgs/applications/networking/cluster/terraform-providers/providers.json

···

       182
       182
        
           "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="

     

       183
       183
        
         },

     

       184
       184
        
         "buildkite": {

     

       185
       185
       -
           "hash": "sha256-GRFthxNKWcdOdFL6gnI7Y3ehSzqt8ijzBe4eyRy0KcM=",

     

       185
       185
       +
           "hash": "sha256-rcklWodBh5iJjxIjGhEH0l3S9bXUWfBG52V/23o8JDM=",

     

       186
       186
        
           "homepage": "https://registry.terraform.io/providers/buildkite/buildkite",

     

       187
       187
        
           "owner": "buildkite",

     

       188
       188
        
           "repo": "terraform-provider-buildkite",

     

       189
       189
       -
           "rev": "v0.23.0",

     

       189
       189
       +
           "rev": "v0.24.0",

     

       190
       190
        
           "spdx": "MIT",

     

       191
       191
       -
           "vendorHash": "sha256-oVXrSI+DU6NgmVIPcS4He4mHVrkA2tMxFUpxMnv0bu4="

     

       191
       191
       +
           "vendorHash": "sha256-3BtXtXhFyTNQD0J/5hNi0JsPcaIDWUQNEgf6r0VIfMM="

     

       192
       192
        
         },

     

       193
       193
        
         "checkly": {

     

       194
       194
        
           "hash": "sha256-tOTrAi6hd4HFbHAj0p/LTYdxQl1R1WuQ9L4hzqmDVqI=",

     
···

       227
       227
        
           "vendorHash": "sha256-VTSbi2pDllzyKDhWs5EpWSXO5oKl+khVqLg/Ro3x8ys="

     

       228
       228
        
         },

     

       229
       229
        
         "cloudfoundry": {

     

       230
       230
       -
           "hash": "sha256-hoX2KNUzC7G+bFxReTN/6IG8/P4rczHAYn2QQ2iOioc=",

     

       230
       230
       +
           "hash": "sha256-yEqsdgTSlwppt6ILRZQ6Epyh5WVN6Il3xsBOa/NfIdo=",

     

       231
       231
        
           "homepage": "https://registry.terraform.io/providers/cloudfoundry-community/cloudfoundry",

     

       232
       232
        
           "owner": "cloudfoundry-community",

     

       233
       233
        
           "repo": "terraform-provider-cloudfoundry",

     

       234
       234
       -
           "rev": "v0.51.2",

     

       234
       234
       +
           "rev": "v0.51.3",

     

       235
       235
        
           "spdx": "MPL-2.0",

     

       236
       236
       -
           "vendorHash": "sha256-FR0HnLLVv8H5jC3gRv8jk2VLsavlHNQny+UqZ00InTY="

     

       236
       236
       +
           "vendorHash": "sha256-0hq4dR1KqnE2IXMwif2/NVKQKRO/QplW/A6sB4pJ+FM="

     

       237
       237
        
         },

     

       238
       238
        
         "cloudinit": {

     

       239
       239
        
           "hash": "sha256-fdtUKD8XC1Y72IzrsCfTZYVYZwLqY3gV2sajiw4Krzw=",

     
···

       501
       501
        
           "vendorHash": null

     

       502
       502
        
         },

     

       503
       503
        
         "hcloud": {

     

       504
       504
       -
           "hash": "sha256-TbEbqTgzp7pUXrhjxvs5hrFI5u//xIIniOvusZsseiE=",

     

       504
       504
       +
           "hash": "sha256-kuC4tm8ob9bg7iLcUaGEHMYh6XaZp4rQiVlnbo1Xzek=",

     

       505
       505
        
           "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",

     

       506
       506
        
           "owner": "hetznercloud",

     

       507
       507
        
           "repo": "terraform-provider-hcloud",

     

       508
       508
       -
           "rev": "v1.42.0",

     

       508
       508
       +
           "rev": "v1.42.1",

     

       509
       509
        
           "spdx": "MPL-2.0",

     

       510
       510
       -
           "vendorHash": "sha256-wrgGxCNa5xLdBEy6RNNCz8ZVracyVsHzHtaQse6Ph+E="

     

       510
       510
       +
           "vendorHash": "sha256-r8njRjQGYESeHuD8pF6rRUe1j2VVMwoDITFi2StC5bk="

     

       511
       511
        
         },

     

       512
       512
        
         "helm": {

     

       513
       513
        
           "hash": "sha256-mGrQ5YKNsv1+Vkan5ohMXnTYofhCQPuTFjemXF/g+tA=",

     
···

       519
       519
        
           "vendorHash": "sha256-a80+gjjoFOKI96pUMvTMyM90F5oCb1Ime8hPQcFedFE="

     

       520
       520
        
         },

     

       521
       521
        
         "heroku": {

     

       522
       522
       -
           "hash": "sha256-tdaj6ZbVCvQTYblgpRC5GFoW8fbzTSHf0j6BM1tOlik=",

     

       522
       522
       +
           "hash": "sha256-PexzolGXe0dy+6vGXVDTqtHGjF66DTtt4/GUyx78RMQ=",

     

       523
       523
        
           "homepage": "https://registry.terraform.io/providers/heroku/heroku",

     

       524
       524
        
           "owner": "heroku",

     

       525
       525
        
           "repo": "terraform-provider-heroku",

     

       526
       526
       -
           "rev": "v5.2.5",

     

       526
       526
       +
           "rev": "v5.2.6",

     

       527
       527
        
           "spdx": null,

     

       528
       528
        
           "vendorHash": null

     

       529
       529
        
         },

     
···

       781
       781
        
           "vendorHash": null

     

       782
       782
        
         },

     

       783
       783
        
         "newrelic": {

     

       784
       784
       -
           "hash": "sha256-6dQ0oJeYBmMhpldt8SyPL0VY4IM4n3Dpg62SYvCjigI=",

     

       784
       784
       +
           "hash": "sha256-tbXRo7VNwjidyg/KcnwqmrxbnplMsUkCQAAsQb0WxSE=",

     

       785
       785
        
           "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",

     

       786
       786
        
           "owner": "newrelic",

     

       787
       787
        
           "repo": "terraform-provider-newrelic",

     

       788
       788
       -
           "rev": "v3.26.0",

     

       788
       788
       +
           "rev": "v3.26.1",

     

       789
       789
        
           "spdx": "MPL-2.0",

     

       790
       790
        
           "vendorHash": "sha256-BWCL84bDsfrcM9Bkc3G6r0RQ1YnonH1D9bDSywTcigw="

     

       791
       791
        
         },

     
···

       836
       836
        
           "vendorHash": null

     

       837
       837
        
         },

     

       838
       838
        
         "okta": {

     

       839
       839
       -
           "hash": "sha256-cNVHEZPUkpruM7EDrriKeefzsHhwC+vyadTztRyGCFA=",

     

       839
       839
       +
           "hash": "sha256-yoO8LDSB80GfEjPR3sf8JcciX+3gM1qtFBv/rFAzb6g=",

     

       840
       840
        
           "homepage": "https://registry.terraform.io/providers/okta/okta",

     

       841
       841
        
           "owner": "okta",

     

       842
       842
        
           "repo": "terraform-provider-okta",

     

       843
       843
       -
           "rev": "v4.1.0",

     

       843
       843
       +
           "rev": "v4.2.0",

     

       844
       844
        
           "spdx": "MPL-2.0",

     

       845
       845
       -
           "vendorHash": "sha256-0KB2L7L6EWN2VMsTKXtWElzBRfmny+JjarhhzZtWxtA="

     

       845
       845
       +
           "vendorHash": "sha256-tXVV8lcB8A66WtsWb2wDcJEERjzbHm/eqHyzIOrVk7E="

     

       846
       846
        
         },

     

       847
       847
        
         "oktaasa": {

     

       848
       848
        
           "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",

     
···

       899
       899
        
           "vendorHash": null

     

       900
       900
        
         },

     

       901
       901
        
         "pagerduty": {

     

       902
       902
       -
           "hash": "sha256-vMMxSmfNz9FZtFyOMo6e5OHX6GWNVAP/X/ewJ0sUHb0=",

     

       902
       902
       +
           "hash": "sha256-pMim8Bjjtuysdd4LgsV4+JPjEMw+3bF8vOKIBJVSScY=",

     

       903
       903
        
           "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",

     

       904
       904
        
           "owner": "PagerDuty",

     

       905
       905
        
           "repo": "terraform-provider-pagerduty",

     

       906
       906
       -
           "rev": "v2.15.2",

     

       906
       906
       +
           "rev": "v2.15.3",

     

       907
       907
        
           "spdx": "MPL-2.0",

     

       908
       908
        
           "vendorHash": null

     

       909
       909
        
         },

+3 -2

pkgs/applications/networking/cluster/tf-summarize/default.nix

···

       13
       13
        
           owner = "dineshba";

     

       14
       14
        
           repo = "tf-summarize";

     

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

     

       16
       16
       -
           sha256 = "0c6fcz0n22mq8bqr82h9lfxx4n1bk9gjlc7d131lpf14yiacih3p";

     

       16
       16
       +
           hash = "sha256-d8DIVPQkuEvDCO0wKl+aK1jSu6MJCpTxQrgKYcFnzjA=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         vendorSha256 = "cnybdZth7qlP2BHK8uvLCoqJtggMIkvaL2+YugiUZRE=";

     

       19
       19
       +
         vendorHash = "sha256-cnybdZth7qlP2BHK8uvLCoqJtggMIkvaL2+YugiUZRE=";

     

       20
       20
       +
       

     

       20
       21
        
         ldflags = [

     

       21
       22
        
           "-s"

     

       22
       23
        
           "-w"

+3 -3

pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix

···

       33
       33
        
       in

     

       34
       34
        
       buildNpmPackage rec {

     

       35
       35
        
         pname = "deltachat-desktop";

     

       36
       36
       -
         version = "1.38.1";

     

       36
       36
       +
         version = "1.40.0";

     

       37
       37
        
       

     

       38
       38
        
         src = fetchFromGitHub {

     

       39
       39
        
           owner = "deltachat";

     

       40
       40
        
           repo = "deltachat-desktop";

     

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

     

       42
       42
       -
           hash = "sha256-nXYXjq6bLGvH4m8ECwxfkcUjOsUUj07bt3NFb3oD0Gw=";

     

       42
       42
       +
           hash = "sha256-QvSBM2zR/LcQ2wtkh6mtlU8iqYmZfv6U5bRyMYjLZhE=";

     

       43
       43
        
         };

     

       44
       44
        
       

     

       45
       45
       -
         npmDepsHash = "sha256-fQKFSWljHHPp1A8lcxVxrMVESuTiB3GkSWDb98yCZz4=";

     

       45
       45
       +
         npmDepsHash = "sha256-lxyXfPNu5U+0cge+cwcXHIJv+gVXCSzc5t/2c4IQxNM=";

     

       46
       46
        
       

     

       47
       47
        
         nativeBuildInputs = [

     

       48
       48
        
           makeWrapper

+3 -8

pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix

···

       17
       17
        
       

     

       18
       18
        
       stdenv.mkDerivation (finalAttrs: {

     

       19
       19
        
         pname = "teams-for-linux";

     

       20
       20
       -
         version = "1.2.8";

     

       20
       20
       +
         version = "1.3.2";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "IsmaelMartinez";

     

       24
       24
        
           repo = "teams-for-linux";

     

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

     

       26
       26
       -
           hash = "sha256-5OocTsQjmNZCnzAY1RfrxD6Ad/kZTIkFl/3OmeJl1oI=";

     

       26
       26
       +
           hash = "sha256-2WoTbkRGH9l6cQrveyxGvO/Dy+0NV4UTDaooYn8k06s=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         offlineCache = fetchYarnDeps {

     

       30
       30
        
           yarnLock = "${finalAttrs.src}/yarn.lock";

     

       31
       31
       -
           hash = "sha256-XUASMWrH8wWeYsr6gCdQGgV/7E6hLDWkJ0BXHZCepKQ=";

     

       31
       31
       +
           hash = "sha256-j5N6d270myUylDVDFQTScbsGp1wlpt5sISDJBRCV/GU=";

     

       32
       32
        
         };

     

       33
       33
       -
       

     

       34
       34
       -
         patches = [

     

       35
       35
       -
           # Can be removed once Electron upstream resolves https://github.com/electron/electron/issues/36660

     

       36
       36
       -
           ./screensharing-wayland-hack-fix.patch

     

       37
       37
       -
         ];

     

       38
       33
        
       

     

       39
       34
        
         nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ];

     

       40
       35

-28

pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch

···

       1
       1
       -
       diff --git a/app/index.js b/app/index.js

     

       2
       2
       -
       index ea89608..98f4a90 100644

     

       3
       3
       -
       --- a/app/index.js

     

       4
       4
       -
       +++ b/app/index.js

     

       5
       5
       -
       @@ -1,4 +1,4 @@

     

       6
       6
       -
       -const { app, ipcMain, desktopCapturer, systemPreferences, powerMonitor } = require('electron');

     

       7
       7
       -
       +const { app, ipcMain, desktopCapturer, nativeImage, systemPreferences, powerMonitor } = require('electron');

     

       8
       8
       -
        const path = require('path');

     

       9
       9
       -
        const fs = require('fs');

     

       10
       10
       -
        const { LucidLog } = require('lucid-log');

     

       11
       11
       -
       @@ -97,7 +97,16 @@ if (!gotTheLock) {

     

       12
       12
       -
        	ipcMain.handle('getSystemIdleState', handleGetSystemIdleState);

     

       13
       13
       -
        	ipcMain.handle('getZoomLevel', handleGetZoomLevel);

     

       14
       14
       -
        	ipcMain.handle('saveZoomLevel', handleSaveZoomLevel);

     

       15
       15
       -
       -	ipcMain.handle('desktopCapturerGetSources', (event, opts) => desktopCapturer.getSources(opts));

     

       16
       16
       -
       +	ipcMain.handle('desktopCapturerGetSources', (event, opts) => process.env.XDG_SESSION_TYPE == 'wayland' ?

     

       17
       17
       -
       +		// Port wayland electron 22+ screenshare "fix" from webcord

     

       18
       18
       -
       +		Promise.resolve([{

     

       19
       19
       -
       +			id: "screen:1:0",

     

       20
       20
       -
       +			appIcon: nativeImage.createEmpty(),

     

       21
       21
       -
       +			display_id: "",

     

       22
       22
       -
       +			name: "Entire Screen",

     

       23
       23
       -
       +			thumbnail: nativeImage.createEmpty()

     

       24
       24
       -
       +		}])

     

       25
       25
       -
       +		: desktopCapturer.getSources(opts));

     

       26
       26
       -
        	ipcMain.handle('getCustomBGList', handleGetCustomBGList);

     

       27
       27
       -
        	ipcMain.on('play-notification-sound', playNotificationSound);

     

       28
       28
       -
        	ipcMain.on('user-status-changed', userStatusChangedHandler);

+6 -3

pkgs/applications/system/monitor/default.nix

···

       9
       9
        
       , pantheon

     

       10
       10
        
       , python3

     

       11
       11
        
       , curl

     

       12
       12
       +
       , flatpak

     

       12
       13
        
       , gettext

     

       13
       14
        
       , glib

     

       14
       15
        
       , gtk3

     
···

       27
       28
        
       

     

       28
       29
        
       stdenv.mkDerivation rec {

     

       29
       30
        
         pname = "monitor";

     

       30
       30
       -
         version = "0.16.1";

     

       31
       31
       +
         version = "0.17.0";

     

       31
       32
        
       

     

       32
       33
        
         src = fetchFromGitHub {

     

       33
       34
        
           owner = "stsdc";

     

       34
       35
        
           repo = "monitor";

     

       35
       36
        
           rev = version;

     

       36
       36
       -
           sha256 = "sha256-ZTsb1xcJ7eeCEPebZW0anmG1SUPAzZakw4WzJql9VTQ=";

     

       37
       37
       +
           sha256 = "sha256-GUNMA4CRO4cKBjNr7i8yRflstbT8g2ciDHppjUUbAOc=";

     

       37
       38
        
           fetchSubmodules = true;

     

       38
       39
        
         };

     

       39
       40
        
       

     
···

       49
       50
        
       

     

       50
       51
        
         buildInputs = [

     

       51
       52
        
           curl

     

       53
       53
       +
           flatpak

     

       52
       54
        
           glib

     

       53
       55
        
           gtk3

     

       54
       56
        
           json-glib

     
···

       85
       87
        
       

     

       86
       88
        
         passthru = {

     

       87
       89
        
           updateScript = gitUpdater {

     

       88
       88
       -
             ignoredVersions = "ci.*";

     

       90
       90
       +
             # Upstream frequently tags these to fix CI, which are mostly irrelevant to us.

     

       91
       91
       +
             ignoredVersions = "-";

     

       89
       92
        
           };

     

       90
       93
        
         };

     

       91
       94

+2 -2

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

···

       20
       20
        
       

     

       21
       21
        
       buildGoModule rec {

     

       22
       22
        
         pname = "gitea";

     

       23
       23
       -
         version = "1.20.1";

     

       23
       23
       +
         version = "1.20.2";

     

       24
       24
        
       

     

       25
       25
        
         # not fetching directly from the git repo, because that lacks several vendor files for the web UI

     

       26
       26
        
         src = fetchurl {

     

       27
       27
        
           url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz";

     

       28
       28
       -
           hash = "sha256-LYOCNZJiGuMM1ly1Sp+0F8Us8LtAXzH5NzJf2CLcHck=";

     

       28
       28
       +
           hash = "sha256-a88ltflOcZQVWcEjC3r6rbPSk6LRtATcEQecYt/wg04=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         vendorHash = null;

+2 -2

pkgs/applications/video/mkvtoolnix/default.nix

···

       46
       46
        
       in

     

       47
       47
        
       stdenv.mkDerivation rec {

     

       48
       48
        
         pname = "mkvtoolnix";

     

       49
       49
       -
         version = "77.0";

     

       49
       49
       +
         version = "78.0";

     

       50
       50
        
       

     

       51
       51
        
         src = fetchFromGitLab {

     

       52
       52
        
           owner = "mbunkus";

     

       53
       53
        
           repo = "mkvtoolnix";

     

       54
       54
        
           rev = "release-${version}";

     

       55
       55
       -
           sha256 = "t+kfFS5c8w+c9wxNh59nceFesfdMy8qvHlUqDbZAxkk=";

     

       55
       55
       +
           sha256 = "sha256-iImcpuGZsRlwBTPyPUsfHAOkOIhc8eYs6rinl8O78oU=";

     

       56
       56
        
         };

     

       57
       57
        
       

     

       58
       58
        
         nativeBuildInputs = [

+3 -2

pkgs/development/libraries/geos/default.nix

···

       21
       21
        
         passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

     

       22
       22
        
       

     

       23
       23
        
         meta = with lib; {

     

       24
       24
       -
           description = "C++ port of the Java Topology Suite (JTS)";

     

       25
       25
       -
           homepage = "https://trac.osgeo.org/geos";

     

       24
       24
       +
           description = "C/C++ library for computational geometry with a focus on algorithms used in geographic information systems (GIS) software";

     

       25
       25
       +
           homepage = "https://libgeos.org";

     

       26
       26
        
           license = licenses.lgpl21Only;

     

       27
       27
        
           maintainers = teams.geospatial.members;

     

       28
       28
        
           pkgConfigModules = [ "geos" ];

     

       29
       29
       +
           mainProgram = "geosop";

     

       29
       30
        
         };

     

       30
       31
        
       })

+2 -2

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

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "level-zero";

     

       10
       10
       -
         version = "1.13.1";

     

       10
       10
       +
         version = "1.13.5";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "oneapi-src";

     

       14
       14
        
           repo = "level-zero";

     

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

     

       16
       16
       -
           hash = "sha256-qV2OM41+DkuT3lDCTHOyNkHixD/HITfCiItBQX6Ewio=";

     

       16
       16
       +
           hash = "sha256-XpLbbcB8M63q+0Vj7NrERSXVIjy5KQrVZMvYijUbJhw=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ cmake addOpenGLRunpath ];

+10 -10

pkgs/development/libraries/libdeltachat/Cargo.lock

···

       1123
       1123
        
       

     

       1124
       1124
        
       [[package]]

     

       1125
       1125
        
       name = "deltachat"

     

       1126
       1126
       -
       version = "1.118.0"

     

       1126
       1126
       +
       version = "1.119.1"

     

       1127
       1127
        
       dependencies = [

     

       1128
       1128
        
        "ansi_term",

     

       1129
       1129
        
        "anyhow",

     
···

       1199
       1199
        
       

     

       1200
       1200
        
       [[package]]

     

       1201
       1201
        
       name = "deltachat-jsonrpc"

     

       1202
       1202
       -
       version = "1.118.0"

     

       1202
       1202
       +
       version = "1.119.1"

     

       1203
       1203
        
       dependencies = [

     

       1204
       1204
        
        "anyhow",

     

       1205
       1205
        
        "async-channel",

     
···

       1223
       1223
        
       

     

       1224
       1224
        
       [[package]]

     

       1225
       1225
        
       name = "deltachat-repl"

     

       1226
       1226
       -
       version = "1.118.0"

     

       1226
       1226
       +
       version = "1.119.1"

     

       1227
       1227
        
       dependencies = [

     

       1228
       1228
        
        "ansi_term",

     

       1229
       1229
        
        "anyhow",

     
···

       1238
       1238
        
       

     

       1239
       1239
        
       [[package]]

     

       1240
       1240
        
       name = "deltachat-rpc-server"

     

       1241
       1241
       -
       version = "1.118.0"

     

       1241
       1241
       +
       version = "1.119.1"

     

       1242
       1242
        
       dependencies = [

     

       1243
       1243
        
        "anyhow",

     

       1244
       1244
        
        "deltachat",

     
···

       1263
       1263
        
       

     

       1264
       1264
        
       [[package]]

     

       1265
       1265
        
       name = "deltachat_ffi"

     

       1266
       1266
       -
       version = "1.118.0"

     

       1266
       1266
       +
       version = "1.119.1"

     

       1267
       1267
        
       dependencies = [

     

       1268
       1268
        
        "anyhow",

     

       1269
       1269
        
        "deltachat",

     
···

       4958
       4958
        
       

     

       4959
       4959
        
       [[package]]

     

       4960
       4960
        
       name = "tokio-tar"

     

       4961
       4961
       -
       version = "0.3.0"

     

       4961
       4961
       +
       version = "0.3.1"

     

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

     

       4963
       4963
       -
       checksum = "a50188549787c32c1c3d9c8c71ad7e003ccf2f102489c5a96e385c84760477f4"

     

       4963
       4963
       +
       checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75"

     

       4964
       4964
        
       dependencies = [

     

       4965
       4965
        
        "filetime",

     

       4966
       4966
        
        "futures-core",

     

       4967
       4967
        
        "libc",

     

       4968
       4968
       -
        "redox_syscall 0.2.16",

     

       4968
       4968
       +
        "redox_syscall 0.3.5",

     

       4969
       4969
        
        "tokio",

     

       4970
       4970
        
        "tokio-stream",

     

       4971
       4971
        
        "xattr",

     
···

       5778
       5778
        
       

     

       5779
       5779
        
       [[package]]

     

       5780
       5780
        
       name = "xattr"

     

       5781
       5781
       -
       version = "0.2.3"

     

       5781
       5781
       +
       version = "1.0.1"

     

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

     

       5783
       5783
       -
       checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc"

     

       5783
       5783
       +
       checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985"

     

       5784
       5784
        
       dependencies = [

     

       5785
       5785
        
        "libc",

     

       5786
       5786
        
       ]

+2 -2

pkgs/development/libraries/libdeltachat/default.nix

···

       19
       19
        
       

     

       20
       20
        
       stdenv.mkDerivation rec {

     

       21
       21
        
         pname = "libdeltachat";

     

       22
       22
       -
         version = "1.118.0";

     

       22
       22
       +
         version = "1.119.1";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchFromGitHub {

     

       25
       25
        
           owner = "deltachat";

     

       26
       26
        
           repo = "deltachat-core-rust";

     

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

     

       28
       28
       -
           hash = "sha256-1vkmz7LFG420zYETYIf3ayOQEPp+hz7Dr7gULz1nJOs=";

     

       28
       28
       +
           hash = "sha256-LP5h99qldf9QoRDmo581H+sUx1QsD6nOGt1ES3Fr/6E=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         patches = [

+2 -2

pkgs/development/libraries/poppler/default.nix

···

       47
       47
        
       in

     

       48
       48
        
       stdenv.mkDerivation (finalAttrs: rec {

     

       49
       49
        
         pname = "poppler-${suffix}";

     

       50
       50
       -
         version = "23.07.0"; # beware: updates often break cups-filters build, check texlive and scribus too!

     

       50
       50
       +
         version = "23.08.0"; # beware: updates often break cups-filters build, check texlive and scribus too!

     

       51
       51
        
       

     

       52
       52
        
         outputs = [ "out" "dev" ];

     

       53
       53
        
       

     

       54
       54
        
         src = fetchurl {

     

       55
       55
        
           url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";

     

       56
       56
       -
           hash = "sha256-8ptLS/R1cmERdkVMjyFQbXHSfspQEaOapEA4swuVfbA=";

     

       56
       56
       +
           hash = "sha256-Skv3/JA7nxoqt9BLfF2CINubxiYcxz/bmoJtwnL0mqg=";

     

       57
       57
        
         };

     

       58
       58
        
       

     

       59
       59
        
         nativeBuildInputs = [

+3

pkgs/development/libraries/qt-6/default.nix

···

       48
       48
        
                 ./patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch

     

       49
       49
        
                 ./patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch

     

       50
       50
        
                 ./patches/0007-qtbase-find-qt-tools-in-QTTOOLSPATH.patch

     

       51
       51
       +
                 ./patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-environment.patch

     

       52
       52
       +
                 ./patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-actuall.patch

     

       53
       53
       +
                 ./patches/0010-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch

     

       51
       54
        
               ];

     

       52
       55
        
             };

     

       53
       56
        
             env = callPackage ./qt-env.nix { };

+35

pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-environment.patch

···

       1
       1
       +
       From 505391a31aa353b8f1cc5d3feb9861582554d9f1 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= <raskolnikov@gnu.org>

     

       3
       3
       +
       Date: Wed, 9 Aug 2023 16:16:21 +0200

     

       4
       4
       +
       Subject: [PATCH 1/3] Find qmlimportscanner in macdeployqt via environment

     

       5
       5
       +
       

     

       6
       6
       +
       The qmlimportscanner tool is provided by qtdeclarative. Because of the

     

       7
       7
       +
       modularized installation in Nix, it can not be found via the usual

     

       8
       8
       +
       mechanisms.  Also, hard-coding it like we do for Qt5 would also not

     

       9
       9
       +
       work, as it would require making qtbase depend on qtdeclarative.

     

       10
       10
       +
       

     

       11
       11
       +
       Here we add an option to provide its location via the environment.

     

       12
       12
       +
       While this means macdeployqt does not work out of the box, it provides

     

       13
       13
       +
       a workaround for users.

     

       14
       14
       +
       ---

     

       15
       15
       +
        src/tools/macdeployqt/shared/shared.cpp | 4 ++++

     

       16
       16
       +
        1 file changed, 4 insertions(+)

     

       17
       17
       +
       

     

       18
       18
       +
       diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp

     

       19
       19
       +
       index 643fe5390a..b8fcc9c9bd 100644

     

       20
       20
       +
       --- a/src/tools/macdeployqt/shared/shared.cpp

     

       21
       21
       +
       +++ b/src/tools/macdeployqt/shared/shared.cpp

     

       22
       22
       +
       @@ -1270,6 +1270,10 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf

     

       23
       23
       +
            if (!QFile::exists(qmlImportScannerPath))

     

       24
       24
       +
                qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner";

     

       25
       25
       +
        

     

       26
       26
       +
       +    // Fallback: Pass qml import scanner via environment variable

     

       27
       27
       +
       +    if (!QFile::exists(qmlImportScannerPath))

     

       28
       28
       +
       +        qmlImportScannerPath = ::qgetenv("NIX_QMLIMPORTSCANNER");

     

       29
       29
       +
       +

     

       30
       30
       +
            // Verify that we found a qmlimportscanner binary

     

       31
       31
       +
            if (!QFile::exists(qmlImportScannerPath)) {

     

       32
       32
       +
                LogError() << "qmlimportscanner not found at" << qmlImportScannerPath;

     

       33
       33
       +
       -- 

     

       34
       34
       +
       2.26.2

     

       35
       35
       +

+35

pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-actuall.patch

···

       1
       1
       +
       From 32df59bea18bebc18d6d308750e88be325522d2e Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= <raskolnikov@gnu.org>

     

       3
       3
       +
       Date: Thu, 10 Aug 2023 14:15:34 +0200

     

       4
       4
       +
       Subject: [PATCH 2/3] Check in the QML folder of this library does actually

     

       5
       5
       +
        exist

     

       6
       6
       +
       

     

       7
       7
       +
       In a modularized installation, this folder will be the location where

     

       8
       8
       +
       `qtbase` itself is installed, but `qtbase` does not have any QML

     

       9
       9
       +
       code, and `qmlimportscanner` will complain that it does not exist.

     

       10
       10
       +
       ---

     

       11
       11
       +
        src/tools/macdeployqt/shared/shared.cpp | 7 +++++--

     

       12
       12
       +
        1 file changed, 5 insertions(+), 2 deletions(-)

     

       13
       13
       +
       

     

       14
       14
       +
       diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp

     

       15
       15
       +
       index b8fcc9c9bd..676d34d545 100644

     

       16
       16
       +
       --- a/src/tools/macdeployqt/shared/shared.cpp

     

       17
       17
       +
       +++ b/src/tools/macdeployqt/shared/shared.cpp

     

       18
       18
       +
       @@ -1290,9 +1290,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf

     

       19
       19
       +
            }

     

       20
       20
       +
            for (const QString &importPath : qmlImportPaths)

     

       21
       21
       +
                argumentList << "-importPath" << importPath;

     

       22
       22
       +
       +

     

       23
       23
       +
            QString qmlImportsPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath);

     

       24
       24
       +
       -    argumentList.append( "-importPath");

     

       25
       25
       +
       -    argumentList.append(qmlImportsPath);

     

       26
       26
       +
       +    if (QFile::exists(qmlImportsPath)) {

     

       27
       27
       +
       +        argumentList.append( "-importPath");

     

       28
       28
       +
       +        argumentList.append(qmlImportsPath);

     

       29
       29
       +
       +    }

     

       30
       30
       +
        

     

       31
       31
       +
            // run qmlimportscanner

     

       32
       32
       +
            QProcess qmlImportScanner;

     

       33
       33
       +
       -- 

     

       34
       34
       +
       2.26.2

     

       35
       35
       +

+30

pkgs/development/libraries/qt-6/patches/0010-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch

···

       1
       1
       +
       From 39eb99dcd66f8ffb632fed6308a49896fe5ad2d3 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= <raskolnikov@gnu.org>

     

       3
       3
       +
       Date: Thu, 10 Aug 2023 14:17:03 +0200

     

       4
       4
       +
       Subject: [PATCH 3/3] Pass to qmlimportscanner the QML2_IMPORT_PATH

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        src/tools/macdeployqt/shared/shared.cpp | 7 +++++++

     

       8
       8
       +
        1 file changed, 7 insertions(+)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp

     

       11
       11
       +
       index 676d34d545..7908b07b3c 100644

     

       12
       12
       +
       --- a/src/tools/macdeployqt/shared/shared.cpp

     

       13
       13
       +
       +++ b/src/tools/macdeployqt/shared/shared.cpp

     

       14
       14
       +
       @@ -1297,6 +1297,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf

     

       15
       15
       +
                argumentList.append(qmlImportsPath);

     

       16
       16
       +
            }

     

       17
       17
       +
        

     

       18
       18
       +
       +    // In a modularized installation of qt as we have in Nix, instead, we will

     

       19
       19
       +
       +    // read the paths from the environment, as they are spread in multiple

     

       20
       20
       +
       +    // locations and normally set in the environment like this

     

       21
       21
       +
       +    auto envQmlImportPaths = ::qgetenv("QML2_IMPORT_PATH").split(':');

     

       22
       22
       +
       +    for (const QString &importPath : envQmlImportPaths)

     

       23
       23
       +
       +        argumentList << "-importPath" << importPath;

     

       24
       24
       +
       +

     

       25
       25
       +
            // run qmlimportscanner

     

       26
       26
       +
            QProcess qmlImportScanner;

     

       27
       27
       +
            qmlImportScanner.start(qmlImportScannerPath, argumentList);

     

       28
       28
       +
       -- 

     

       29
       29
       +
       2.26.2

     

       30
       30
       +

+2 -1

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

···

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "ludeeus";

     

       18
       18
        
           repo = pname;

     

       19
       19
       -
           rev = version;

     

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

     

       20
       20
        
           hash = "sha256-3bHE3U4MM/fQM9zBYfoLpAObay82vchjX9FpJukMGNg=";

     

       21
       21
        
         };

     

       22
       22
        
       

     
···

       41
       41
        
         meta = with lib; {

     

       42
       42
        
           description = "Python module to deal with versions";

     

       43
       43
        
           homepage = "https://github.com/ludeeus/awesomeversion";

     

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

     

       44
       45
        
           license = with licenses; [ mit ];

     

       45
       46
        
           maintainers = with maintainers; [ fab ];

     

       46
       47
        
         };

+6 -2

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

···

       19
       19
        
       

     

       20
       20
        
       buildPythonPackage rec {

     

       21
       21
        
         pname = "ax";

     

       22
       22
       -
         version = "0.3.2";

     

       22
       22
       +
         version = "0.3.4";

     

       23
       23
        
         format = "pyproject";

     

       24
       24
        
       

     

       25
       25
        
         src = fetchFromGitHub {

     

       26
       26
        
           owner = "facebook";

     

       27
       27
        
           repo = pname;

     

       28
       28
        
           rev = version;

     

       29
       29
       -
           hash = "sha256-1KLLjeUktXvIDOlTQzMmpbL/On8PTxZQ44Qi4BT3nPk=";

     

       29
       29
       +
           hash = "sha256-Yc6alEKXbtQ0hitIdPhkJWhZQg150b0NJJRLZ+f1hdY=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         nativeBuildInputs = [

     
···

       65
       65
        
           "--ignore=ax/service/tests/test_scheduler.py"

     

       66
       66
        
           "--ignore=ax/service/tests/test_with_db_settings_base.py"

     

       67
       67
        
           "--ignore=ax/storage"

     

       68
       68
       +
         ];

     

       69
       69
       +
         disabledTests = [

     

       70
       70
       +
           # exact comparison of floating points

     

       71
       71
       +
           "test_optimize_l0_homotopy"

     

       68
       72
        
         ];

     

       69
       73
        
         pythonImportsCheck = [ "ax" ];

     

       70
       74

+47

pkgs/development/python-modules/backports-strenum/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pytestCheckHook

     

       5
       5
       +
       , pythonOlder

     

       6
       6
       +
       , setuptools

     

       7
       7
       +
       , setuptools-scm

     

       8
       8
       +
       , wheel

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       buildPythonPackage rec {

     

       12
       12
       +
         pname = "backports-strenum";

     

       13
       13
       +
         version = "1.2.4";

     

       14
       14
       +
         format = "pyproject";

     

       15
       15
       +
       

     

       16
       16
       +
         disabled = pythonOlder "3.8";

     

       17
       17
       +
       

     

       18
       18
       +
         src = fetchFromGitHub {

     

       19
       19
       +
           owner = "clbarnes";

     

       20
       20
       +
           repo = "backports.strenum";

     

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

     

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

     

       23
       23
       +
         };

     

       24
       24
       +
       

     

       25
       25
       +
         SETUPTOOLS_SCM_PRETEND_VERSION = version;

     

       26
       26
       +
       

     

       27
       27
       +
         nativeBuildInputs = [

     

       28
       28
       +
           setuptools

     

       29
       29
       +
           setuptools-scm

     

       30
       30
       +
           wheel

     

       31
       31
       +
         ];

     

       32
       32
       +
       

     

       33
       33
       +
         nativeCheckInputs = [

     

       34
       34
       +
           pytestCheckHook

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       37
       37
       +
         pythonImportsCheck = [

     

       38
       38
       +
           "backports.strenum"

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         meta = with lib; {

     

       42
       42
       +
           description = "Base class for creating enumerated constants that are also subclasses of str";

     

       43
       43
       +
           homepage = "https://github.com/clbarnes/backports.strenum";

     

       44
       44
       +
           license = with licenses; [ psfl ];

     

       45
       45
       +
           maintainers = with maintainers; [ fab ];

     

       46
       46
       +
         };

     

       47
       47
       +
       }

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "boschshcpy";

     

       13
       13
       -
         version = "0.2.57";

     

       13
       13
       +
         version = "0.2.60";

     

       14
       14
        
         format = "setuptools";

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.7";

     
···

       19
       19
        
           owner = "tschamm";

     

       20
       20
        
           repo = pname;

     

       21
       21
        
           rev = version;

     

       22
       22
       -
           hash = "sha256-/TD5zvvtOkoVG+EJzNNSMbOKXm78Di9tDrBIxpN4wbg=";

     

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

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [

+2 -2

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

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "botorch";

     

       18
       18
       -
         version = "0.8.5";

     

       18
       18
       +
         version = "0.9.2";

     

       19
       19
        
         format = "pyproject";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "pytorch";

     

       23
       23
        
           repo = pname;

     

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

     

       25
       25
       -
           hash = "sha256-VcNHgfk8OfLJseQxHksycWuCPCudCtOdcRV0XnxHSfU=";

     

       25
       25
       +
           hash = "sha256-8obS+qMQwepKUxPkMbufR/SaacYekl6FA6t6XW6llA4=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

+2 -2

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

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "caldav";

     

       17
       17
       -
         version = "1.2.1";

     

       17
       17
       +
         version = "1.3.6";

     

       18
       18
        
       

     

       19
       19
        
         format = "setuptools";

     

       20
       20
        
         disabled = pythonOlder "3.7";

     
···

       23
       23
        
           owner = "python-caldav";

     

       24
       24
        
           repo = pname;

     

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

     

       26
       26
       -
           hash = "sha256-nA7if28M4rDZwlF+ga/1FqD838zeu0OblrPUer3w3qM=";

     

       26
       26
       +
           hash = "sha256-N3pY3UYxOZgZbXqqsvASej12dOtdpyEHOL10btOKm/w=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         propagatedBuildInputs = [

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "casbin";

     

       12
       12
       -
         version = "1.23.0";

     

       12
       12
       +
         version = "1.23.1";

     

       13
       13
        
         format = "setuptools";

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.6";

     
···

       18
       18
        
           owner = pname;

     

       19
       19
        
           repo = "pycasbin";

     

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

     

       21
       21
       -
           hash = "sha256-CPbWPDimbarmltwren63hRj/B7LF9+5osiQAZ6sWsks=";

     

       21
       21
       +
           hash = "sha256-jL02G4Z2Lhy/02Lb7aSUDEKg2h34UXJbwMFaDSPgc+U=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         propagatedBuildInputs = [

+22 -9

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, isPy27, six }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , pythonOlder

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , pytestCheckHook

     

       6
       6
       +
       }:

     

       2
       7
        
       

     

       3
       8
        
       buildPythonPackage rec {

     

       4
       9
        
         pname = "cfgv";

     

       5
       5
       -
         version = "3.3.1";

     

       6
       6
       -
         disabled = isPy27;

     

       10
       10
       +
         version = "3.4.0";

     

       11
       11
       +
         format = "setuptools";

     

       7
       12
        
       

     

       8
       8
       -
         src = fetchPypi {

     

       9
       9
       -
           inherit pname version;

     

       10
       10
       -
           sha256 = "f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736";

     

       13
       13
       +
         disabled = pythonOlder "3.8";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "asottile";

     

       17
       17
       +
           repo = "cfgv";

     

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

     

       19
       19
       +
           hash = "sha256-P02j53dltwdrlUBG89AI+P2GkXYKTVrQNF15rZt58jw=";

     

       11
       20
        
         };

     

       12
       21
        
       

     

       13
       13
       -
         propagatedBuildInputs = [ six ];

     

       22
       22
       +
         nativeCheckInputs = [

     

       23
       23
       +
           pytestCheckHook

     

       24
       24
       +
         ];

     

       14
       25
        
       

     

       15
       15
       -
         # Tests not included in PyPI tarball

     

       16
       16
       -
         doCheck = false;

     

       26
       26
       +
         pythonImportsCheck = [

     

       27
       27
       +
           "cfgv"

     

       28
       28
       +
         ];

     

       17
       29
        
       

     

       18
       30
        
         meta = with lib; {

     

       19
       31
        
           description = "Validate configuration and produce human readable error messages";

     

       20
       32
        
           homepage = "https://github.com/asottile/cfgv";

     

       21
       33
        
           license = licenses.mit;

     

       34
       34
       +
           maintainers = with lib.maintainers; [ nickcao ];

     

       22
       35
        
         };

     

       23
       36
        
       }

+3 -3

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

···

       36
       36
        
       in

     

       37
       37
        
       buildPythonPackage rec {

     

       38
       38
        
         pname = "deid";

     

       39
       39
       -
         version = "0.3.21";

     

       39
       39
       +
         version = "0.3.22";

     

       40
       40
        
       

     

       41
       41
        
         format = "pyproject";

     

       42
       42
        
         disabled = pythonOlder "3.7";

     
···

       46
       46
        
           owner = "pydicom";

     

       47
       47
        
           repo = pname;

     

       48
       48
        
           # the github repo does not contain Pypi version tags:

     

       49
       49
       -
           rev = "38717b8cbfd69566ba489dd0c9858bb93101e26d";

     

       50
       50
       -
           hash = "sha256-QqofxNjshbNfu8vZ37rB6pxj5R8q0wlUhJRhrpkKySk=";

     

       49
       49
       +
           rev = "40dc96125daeb65856d643e12c3d6dfec756be0d";

     

       50
       50
       +
           hash = "sha256-OtxQPF29eqt8I1Q12ga8a1IjBVO+VBk6y0DQmRtCNoU=";

     

       51
       51
        
         };

     

       52
       52
        
       

     

       53
       53
        
         propagatedBuildInputs = [

+9 -1

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

···

       59
       59
        
         src = fetchFromGitHub {

     

       60
       60
        
           owner = "facebookresearch";

     

       61
       61
        
           repo = "detectron2";

     

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

     

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

     

       63
       63
        
           sha256 = "1w6cgvc8r2lwr72yxicls650jr46nriv1csivp2va9k1km8jx2sf";

     

       64
       64
        
         };

     

       65
       65
       +
       

     

       66
       66
       +
         postPatch = ''

     

       67
       67
       +
           # https://github.com/facebookresearch/detectron2/issues/5010

     

       68
       68
       +
           substituteInPlace detectron2/data/transforms/transform.py \

     

       69
       69
       +
             --replace "interp=Image.LINEAR" "interp=Image.BILINEAR"

     

       70
       70
       +
         '';

     

       65
       71
        
       

     

       66
       72
        
         nativeBuildInputs = [

     

       67
       73
        
           pythonRelaxDepsHook

     
···

       123
       129
        
           "tests/structures/test_instances.py"

     

       124
       130
        
           # hangs for some reason

     

       125
       131
        
           "tests/modeling/test_model_e2e.py"

     

       132
       132
       +
           # KeyError: 'precision'

     

       133
       133
       +
           "tests/data/test_coco_evaluation.py"

     

       126
       134
        
         ];

     

       127
       135
        
       

     

       128
       136
        
         disabledTests = [

+2 -2

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

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "fakeredis";

     

       19
       19
       -
         version = "2.17.0";

     

       19
       19
       +
         version = "2.18.0";

     

       20
       20
        
         format = "pyproject";

     

       21
       21
        
       

     

       22
       22
        
         disabled = pythonOlder "3.7";

     
···

       25
       25
        
           owner = "dsoftwareinc";

     

       26
       26
        
           repo = "fakeredis-py";

     

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

     

       28
       28
       -
           hash = "sha256-nDxuXDWnTt/ljd/M4pElo4U8jn91l+J9fPAfYpS0mOc=";

     

       28
       28
       +
           hash = "sha256-+bJbtqBUgix4oIq49hQEk3/cNXfvXFXE/m/qR1zy8jo=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [

+4 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "gpytorch";

     

       12
       12
       -
         version = "1.10";

     

       12
       12
       +
         version = "1.11";

     

       13
       13
        
         format = "pyproject";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "cornellius-gp";

     

       17
       17
        
           repo = pname;

     

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

     

       19
       19
       -
           hash = "sha256-KY3ItkVjBfIYMkZAmD56EBGR9YN/MRN7b2K3zrK6Qmk=";

     

       19
       19
       +
           hash = "sha256-cpkfjx5G/4duL1Rr4nkHTHi03TDcYbcx3bKP2Ny7Ijo=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         postPatch = ''

     
···

       40
       40
        
           # flaky numerical tests

     

       41
       41
        
           "test_classification_error"

     

       42
       42
        
           "test_matmul_matrix_broadcast"

     

       43
       43
       +
           # https://github.com/cornellius-gp/gpytorch/issues/2396

     

       44
       44
       +
           "test_t_matmul_matrix"

     

       43
       45
        
         ];

     

       44
       46
        
       

     

       45
       47
        
         meta = with lib; {

+4 -2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       +
       , jaxtyping

     

       4
       5
        
       , scipy

     

       5
       6
        
       , torch

     

       6
       7
        
       , pytestCheckHook

     
···

       8
       9
        
       

     

       9
       10
        
       buildPythonPackage rec {

     

       10
       11
        
         pname = "linear_operator";

     

       11
       11
       -
         version = "0.4.0";

     

       12
       12
       +
         version = "0.5.1";

     

       12
       13
        
         format = "pyproject";

     

       13
       14
        
       

     

       14
       15
        
         src = fetchFromGitHub {

     

       15
       16
        
           owner = "cornellius-gp";

     

       16
       17
        
           repo = pname;

     

       17
       18
        
           rev = "v${version}";

     

       18
       18
       -
           hash = "sha256-0f3F3k3xJACbx42jtwsAmjZwPAOfLywZs8VOrwWicc4=";

     

       19
       19
       +
           hash = "sha256-7NkcvVDwFaLHBZZhq7aKY3cWxe90qeKmodP6cVsdrPM=";

     

       19
       20
        
         };

     

       20
       21
        
       

     

       21
       22
        
         postPatch = ''

     
···

       24
       25
        
         '';

     

       25
       26
        
       

     

       26
       27
        
         propagatedBuildInputs = [

     

       28
       28
       +
           jaxtyping

     

       27
       29
        
           scipy

     

       28
       30
        
           torch

     

       29
       31
        
         ];

+2 -2

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

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "lxmf";

     

       10
       10
       -
         version = "0.3.1";

     

       10
       10
       +
         version = "0.3.2";

     

       11
       11
        
         format = "setuptools";

     

       12
       12
        
       

     

       13
       13
        
         disabled = pythonOlder "3.7";

     
···

       16
       16
        
           owner = "markqvist";

     

       17
       17
        
           repo = "lxmf";

     

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

     

       19
       19
       -
           hash = "sha256-uz3IUUL5rdYwUsBNdHB+K/ZaCCnUE5EThFConVl8YgM=";

     

       19
       19
       +
           hash = "sha256-6ZnYI6GlFkMjBLsZhhFg8G9j3I/DfjLAnKsRFEua7uU=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "nomadnet";

     

       13
       13
       -
         version = "0.3.5";

     

       13
       13
       +
         version = "0.3.6";

     

       14
       14
        
         format = "setuptools";

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.7";

     
···

       19
       19
        
           owner = "markqvist";

     

       20
       20
        
           repo = "NomadNet";

     

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

     

       22
       22
       -
           hash = "sha256-SPQ/3ntdD+EBW2YZJKfg2lornlg1ktnvTd1PNAqNSIg=";

     

       22
       22
       +
           hash = "sha256-3b6uwojekWthH5AsAVfS/ue+yAoIMac1LQff1mrM9PM=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [

+19 -6

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchFromGitHub, pycryptodome, enlighten, zstandard

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pycryptodome

     

       5
       5
       +
       , pythonOlder

     

       6
       6
       +
       , enlighten

     

       7
       7
       +
       , zstandard

     

       2
       8
        
       , withGUI ? true

     

       3
       9
        
       , kivy

     

       4
       10
        
       }:

     

       5
       11
        
       

     

       6
       12
        
       buildPythonPackage rec {

     

       7
       13
        
         pname = "nsz";

     

       8
       8
       -
         version = "4.3.0";

     

       14
       14
       +
         version = "4.4.0";

     

       15
       15
       +
         format = "setuptools";

     

       16
       16
       +
       

     

       17
       17
       +
         disabled = pythonOlder "3.7";

     

       9
       18
        
       

     

       10
       19
        
         src = fetchFromGitHub {

     

       11
       20
        
           owner = "nicoboss";

     

       12
       21
        
           repo = pname;

     

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

     

       14
       14
       -
           hash = "sha256-azmUJ3ofLdNwNeIQL/TuPYE98FZ8yXwbJx3wHCo8lw4=";

     

       23
       23
       +
           hash = "sha256-glK4CK7D33FfLqHLxVr4kkb887/A9tqxPwWpcXYZu/0=";

     

       15
       24
        
         };

     

       16
       25
        
       

     

       17
       17
       -
         propagatedBuildInputs = [pycryptodome enlighten zstandard ]

     

       18
       18
       -
           ++ lib.optional withGUI kivy;

     

       26
       26
       +
         propagatedBuildInputs = [

     

       27
       27
       +
           pycryptodome

     

       28
       28
       +
           enlighten

     

       29
       29
       +
           zstandard

     

       30
       30
       +
         ] ++ lib.optional withGUI kivy;

     

       19
       31
        
       

     

       20
       32
        
         # do not check, as nsz requires producation keys

     

       21
       33
        
         # dumped from a Nintendo Switch.

     
···

       23
       35
        
       

     

       24
       36
        
         meta = with lib; {

     

       25
       37
        
           homepage = "https://github.com/nicoboss/nsz";

     

       26
       26
       -
           description = "NSZ - Homebrew compatible NSP/XCI compressor/decompressor";

     

       38
       38
       +
           description = "Homebrew compatible NSP/XCI compressor/decompressor";

     

       39
       39
       +
           changelog = "https://github.com/nicoboss/nsz/releases/tag/${version}";

     

       27
       40
        
           license = licenses.mit;

     

       28
       41
        
           maintainers = with maintainers; [ eyjhb ];

     

       29
       42
        
         };

+4 -4

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
       -
       , coloredlogs

     

       4
       3
        
       , deprecation

     

       5
       4
        
       , fetchFromGitHub

     

       6
       5
        
       , ghostscript

     
···

       17
       16
        
       , pytest-xdist

     

       18
       17
        
       , pytestCheckHook

     

       19
       18
        
       , pythonOlder

     

       19
       19
       +
       , rich

     

       20
       20
        
       , reportlab

     

       21
       21
        
       , setuptools

     

       22
       22
        
       , setuptools-scm

     
···

       30
       30
        
       

     

       31
       31
        
       buildPythonPackage rec {

     

       32
       32
        
         pname = "ocrmypdf";

     

       33
       33
       -
         version = "14.3.0";

     

       33
       33
       +
         version = "14.4.0";

     

       34
       34
        
       

     

       35
       35
        
         disabled = pythonOlder "3.8";

     

       36
       36
        
       

     
···

       46
       46
        
           postFetch = ''

     

       47
       47
        
             rm "$out/.git_archival.txt"

     

       48
       48
        
           '';

     

       49
       49
       -
           hash = "sha256-OUz19N2YIl7iwayjulx0v1K00jB5SdWo8m5XiJ9BDSs=";

     

       49
       49
       +
           hash = "sha256-i1ZUBKR8dJXZkALUFwkzYcjtZ5Li66DfD2fupCGRQC4=";

     

       50
       50
        
         };

     

       51
       51
        
       

     

       52
       52
        
         SETUPTOOLS_SCM_PRETEND_VERSION = version;

     
···

       69
       69
        
         ];

     

       70
       70
        
       

     

       71
       71
        
         propagatedBuildInputs = [

     

       72
       72
       -
           coloredlogs

     

       73
       72
        
           deprecation

     

       74
       73
        
           img2pdf

     

       75
       74
        
           packaging

     
···

       78
       77
        
           pillow

     

       79
       78
        
           pluggy

     

       80
       79
        
           reportlab

     

       80
       80
       +
           rich

     

       81
       81
        
           tqdm

     

       82
       82
        
         ] ++ lib.optionals (pythonOlder "3.9") [

     

       83
       83
        
           importlib-resources

+34 -22

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
       +
       , aenum

     

       4
       4
       +
       , aiohttp

     

       3
       5
        
       , buildPythonPackage

     

       4
       6
        
       , fetchPypi

     

       5
       5
       -
       # install requirements

     

       6
       6
       -
       , pycryptodome

     

       7
       7
       -
       , yarl

     

       8
       7
        
       , flatdict

     

       9
       9
       -
       , python-jose

     

       10
       10
       -
       , aenum

     

       11
       11
       -
       , aiohttp

     

       8
       8
       +
       , pycryptodome

     

       9
       9
       +
       , pycryptodomex

     

       12
       10
        
       , pydash

     

       13
       13
       -
       , xmltodict

     

       14
       14
       -
       , pyyaml

     

       15
       15
       -
       # test requirements

     

       16
       16
       -
       , pytestCheckHook

     

       17
       17
       -
       , pytest-recording

     

       11
       11
       +
       , pyfakefs

     

       18
       12
        
       , pytest-asyncio

     

       19
       13
        
       , pytest-mock

     

       20
       20
       -
       , pyfakefs

     

       14
       14
       +
       , pytest-recording

     

       15
       15
       +
       , pytestCheckHook

     

       16
       16
       +
       , python-jose

     

       17
       17
       +
       , pythonOlder

     

       18
       18
       +
       , pyyaml

     

       19
       19
       +
       , xmltodict

     

       20
       20
       +
       , yarl

     

       21
       21
        
       }:

     

       22
       22
        
       

     

       23
       23
        
       buildPythonPackage rec {

     

       24
       24
        
         pname = "okta";

     

       25
       25
       -
         version = "2.8.0";

     

       25
       25
       +
         version = "2.9.2";

     

       26
       26
       +
         format = "setuptools";

     

       27
       27
       +
       

     

       28
       28
       +
         disabled = pythonOlder "3.7";

     

       26
       29
        
       

     

       27
       30
        
         src = fetchPypi {

     

       28
       31
        
           inherit pname version;

     

       29
       29
       -
           sha256 = "sha256-yIVJoKX9b9Y7Ydl28twHxgPbUa58LJ12Oz3tvpU7CAc=";

     

       32
       32
       +
           hash = "sha256-kbzqriybzN/86vov3Q+kH2lj9plK1GzWPlc/Nc/nWF0=";

     

       30
       33
        
         };

     

       31
       34
        
       

     

       32
       35
        
         propagatedBuildInputs = [

     

       33
       33
       -
           pycryptodome

     

       34
       34
       -
           yarl

     

       35
       35
       -
           flatdict

     

       36
       36
       -
           python-jose

     

       37
       36
        
           aenum

     

       38
       37
        
           aiohttp

     

       38
       38
       +
           flatdict

     

       39
       39
       +
           pycryptodome

     

       40
       40
       +
           pycryptodomex

     

       39
       41
        
           pydash

     

       42
       42
       +
           python-jose

     

       43
       43
       +
           pyyaml

     

       40
       44
        
           xmltodict

     

       41
       41
       -
           pyyaml

     

       45
       45
       +
           yarl

     

       42
       46
        
         ];

     

       43
       47
        
       

     

       44
       48
        
         checkInputs = [

     

       45
       45
       -
           pytestCheckHook

     

       49
       49
       +
           pyfakefs

     

       46
       50
        
           pytest-asyncio

     

       47
       51
        
           pytest-mock

     

       48
       52
        
           pytest-recording

     

       49
       49
       -
           pyfakefs

     

       53
       53
       +
           pytestCheckHook

     

       50
       54
        
         ];

     

       51
       55
        
       

     

       52
       52
       -
         pytestFlagsArray = [ "tests/" ];

     

       56
       56
       +
         pytestFlagsArray = [

     

       57
       57
       +
           "tests/"

     

       58
       58
       +
         ];

     

       53
       59
        
       

     

       54
       60
        
         disabledTests = [

     

       55
       61
        
           "test_client_raise_exception"

     

       62
       62
       +
           # vcr.errors.CannotOverwriteExistingCassetteException: Can't overwrite existing cassette

     

       63
       63
       +
           "test_get_org_contact_user"

     

       64
       64
       +
           "test_update_org_contact_user"

     

       65
       65
       +
           "test_get_role_subscription"

     

       66
       66
       +
           "test_subscribe_unsubscribe"

     

       56
       67
        
         ];

     

       57
       68
        
       

     

       58
       69
        
         pythonImportsCheck = [

     
···

       68
       79
        
         meta = with lib; {

     

       69
       80
        
           description = "Python SDK for the Okta Management API";

     

       70
       81
        
           homepage = "https://github.com/okta/okta-sdk-python";

     

       82
       82
       +
           changelog = "https://github.com/okta/okta-sdk-python/blob/v${version}/CHANGELOG.md";

     

       71
       83
        
           license = licenses.asl20;

     

       72
       84
        
           maintainers = with maintainers; [ jbgosselin ];

     

       73
       85
        
         };

+8 -4

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

···

       24
       24
        
       

     

       25
       25
        
       buildPythonPackage rec {

     

       26
       26
        
         pname = "pandas-stubs";

     

       27
       27
       -
         version = "1.5.3.230321";

     

       27
       27
       +
         version = "2.0.3.230814";

     

       28
       28
        
         format = "pyproject";

     

       29
       29
        
       

     

       30
       30
        
         disabled = pythonOlder "3.8";

     
···

       33
       33
        
           owner = "pandas-dev";

     

       34
       34
        
           repo = pname;

     

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

     

       36
       36
       -
           hash = "sha256-RjU762VyDPy86Cvmr8hfPkqLtmntB3F6tf2OAgqmnK4=";

     

       36
       36
       +
           hash = "sha256-V/igL+vPJADOL7LwBJljqs2a1BB3vDVYTWXIkK/ImYY=";

     

       37
       37
        
         };

     

       38
       38
        
       

     

       39
       39
        
         nativeBuildInputs = [

     
···

       66
       66
        
           # AttributeErrors, missing dependencies, error and warning checks

     

       67
       67
        
           "test_aggregate_frame_combinations"

     

       68
       68
        
           "test_aggregate_series_combinations"

     

       69
       69
       +
           "test_all_read_without_lxml_dtype_backend"

     

       69
       70
        
           "test_arrow_dtype"

     

       70
       71
        
           "test_attribute_conflict_warning"

     

       71
       72
        
           "test_categorical_conversion_warning"

     
···

       79
       80
        
           "test_database_error"

     

       80
       81
        
           "test_dummies"

     

       81
       82
        
           "test_from_dummies_args"

     

       83
       83
       +
           "test_hdf_context_manager"

     

       84
       84
       +
           "test_hdfstore"

     

       82
       85
        
           "test_incompatibility_warning"

     

       83
       86
        
           "test_index_astype"

     

       84
       87
        
           "test_indexing_error"

     
···

       95
       98
        
           "test_possible_precision_loss"

     

       96
       99
        
           "test_pyperclip_exception"

     

       97
       100
        
           "test_quantile_150_changes"

     

       101
       101
       +
           "test_read_hdf_iterator"

     

       102
       102
       +
           "test_read_sql_via_sqlalchemy_connection"

     

       103
       103
       +
           "test_read_sql_via_sqlalchemy_engine"

     

       98
       104
        
           "test_resample_150_changes"

     

       99
       105
        
           "test_reset_index_150_changes"

     

       100
       106
        
           "test_reset_index"

     
···

       107
       113
        
           "test_types_rank"

     

       108
       114
        
           "test_undefined_variable_error"

     

       109
       115
        
           "test_value_label_type_mismatch"

     

       110
       110
       -
           "test_read_sql_via_sqlalchemy_connection"

     

       111
       111
       -
           "test_read_sql_via_sqlalchemy_engine"

     

       112
       116
        
         ] ++ lib.optionals stdenv.isDarwin [

     

       113
       117
        
           "test_plotting" # Fatal Python error: Illegal instruction

     

       114
       118
        
         ];

+19 -29

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

···

       1
       1
        
       { lib

     

       2
       2
       -
       , stdenv

     

       3
       2
        
       , buildPythonPackage

     

       4
       3
        
       , fetchFromGitHub

     

       5
       5
       -
       , pythonOlder

     

       6
       6
       -
       # build inputs

     

       4
       4
       +
       , jupyterlab

     

       5
       5
       +
       , nbexec

     

       6
       6
       +
       , pandas

     

       7
       7
       +
       , pandas-stubs

     

       7
       8
        
       , pdfminer-six

     

       8
       9
        
       , pillow

     

       9
       9
       -
       , wand

     

       10
       10
       -
       # check inputs

     

       11
       11
       -
       , pytestCheckHook

     

       12
       12
       -
       , pytest-cov

     

       13
       10
        
       , pytest-parallel

     

       14
       14
       -
       , flake8

     

       15
       15
       -
       , black

     

       16
       16
       -
       , isort

     

       17
       17
       -
       , pandas

     

       18
       18
       -
       , mypy

     

       19
       19
       -
       , pandas-stubs

     

       11
       11
       +
       , pytestCheckHook

     

       12
       12
       +
       , pythonOlder

     

       20
       13
        
       , types-pillow

     

       21
       21
       -
       , jupyterlab

     

       22
       22
       -
       , nbexec

     

       14
       14
       +
       , wand

     

       23
       15
        
       }:

     

       24
       24
       -
       let

     

       16
       16
       +
       

     

       17
       17
       +
       buildPythonPackage rec {

     

       25
       18
        
         pname = "pdfplumber";

     

       26
       19
        
         version = "0.9.0";

     

       27
       27
       -
       in

     

       28
       28
       -
       buildPythonPackage {

     

       29
       29
       -
         inherit pname version;

     

       30
       20
        
         format = "setuptools";

     

       31
       21
        
       

     

       32
       22
        
         disabled = pythonOlder "3.7";

     
···

       38
       28
        
           hash = "sha256-cGTn1JTSp1YvksemjlvvToZcVauZ7GKINiNmG5f4zKg=";

     

       39
       29
        
         };

     

       40
       30
        
       

     

       31
       31
       +
         postPatch = ''

     

       32
       32
       +
           substituteInPlace setup.cfg \

     

       33
       33
       +
             --replace "--cov=pdfplumber --cov-report xml:coverage.xml --cov-report term" ""

     

       34
       34
       +
         '';

     

       35
       35
       +
       

     

       41
       36
        
         propagatedBuildInputs = [

     

       42
       37
        
           pdfminer-six

     

       43
       38
        
           pillow

     
···

       49
       44
        
         '';

     

       50
       45
        
       

     

       51
       46
        
         nativeCheckInputs = [

     

       52
       52
       -
           pytestCheckHook

     

       53
       53
       -
           pytest-cov

     

       54
       54
       -
           pytest-parallel

     

       55
       55
       -
           flake8

     

       56
       56
       -
           black

     

       57
       57
       -
           isort

     

       47
       47
       +
           jupyterlab

     

       48
       48
       +
           nbexec

     

       58
       49
        
           pandas

     

       59
       59
       -
           mypy

     

       60
       50
        
           pandas-stubs

     

       51
       51
       +
           pytest-parallel

     

       52
       52
       +
           pytestCheckHook

     

       61
       53
        
           types-pillow

     

       62
       62
       -
           jupyterlab

     

       63
       63
       -
           nbexec

     

       64
       54
        
         ];

     

       65
       55
        
       

     

       66
       56
        
         pythonImportsCheck = [

     
···

       73
       63
        
         ];

     

       74
       64
        
       

     

       75
       65
        
         meta = with lib; {

     

       76
       76
       -
           description = "Plumb a PDF for detailed information about each char, rectangle, line, et cetera — and easily extract text and tables.";

     

       66
       66
       +
           description = "Plumb a PDF for detailed information about each char, rectangle, line, et cetera — and easily extract text and tables";

     

       77
       67
        
           homepage = "https://github.com/jsvine/pdfplumber";

     

       78
       68
        
           changelog = "https://github.com/jsvine/pdfplumber/releases/tag/v${version}";

     

       79
       69
        
           license = licenses.mit;

+4 -4

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

···

       11
       11
        
       

     

       12
       12
        
       let

     

       13
       13
        
         pname = "pydicom";

     

       14
       14
       -
         version = "2.3.1";

     

       14
       14
       +
         version = "2.4.2";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "pydicom";

     

       18
       18
        
           repo = "pydicom";

     

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

     

       20
       20
       -
           hash = "sha256-xt0aK908lLgNlpcI86OSxy96Z/PZnQh7+GXzJ0VMQGA=";

     

       20
       20
       +
           hash = "sha256-FNZVu2/7kBGeP4iTH53bsApfHzHFxr5bxqbqkI4T95E=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         # Pydicom needs pydicom-data to run some tests. If these files aren't downloaded

     
···

       25
       25
        
         test_data = fetchFromGitHub {

     

       26
       26
        
           owner = "pydicom";

     

       27
       27
        
           repo = "pydicom-data";

     

       28
       28
       -
           rev = "bbb723879690bb77e077a6d57657930998e92bd5";

     

       29
       29
       -
           hash = "sha256-dCI1temvpNWiWJYVfQZKy/YJ4ad5B0e9hEKHJnEeqzk=";

     

       28
       28
       +
           rev = "cbb9b2148bccf0f550e3758c07aca3d0e328e768";

     

       29
       29
       +
           hash = "sha256-nF/j7pfcEpWHjjsqqTtIkW8hCEbuQ3J4IxpRk0qc1CQ=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
       in

+2 -2

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

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "pyipp";

     

       18
       18
       -
         version = "0.14.2";

     

       18
       18
       +
         version = "0.14.3";

     

       19
       19
        
         format = "pyproject";

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.9";

     
···

       24
       24
        
          owner = "ctalkington";

     

       25
       25
        
          repo = "python-ipp";

     

       26
       26
        
          rev = version;

     

       27
       27
       -
          hash = "sha256-IPmpup0VrilfLnYiigjVjL6oRwW4RPlgiafIy7yyckI=";

     

       27
       27
       +
          hash = "sha256-WbrAvIdFUPzSxGjIPzNny0V1W8S774vyREgylenJp24=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         postPatch = ''

+6 -4

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

···

       2
       2
        
       , aiohttp

     

       3
       3
        
       , attrs

     

       4
       4
        
       , backoff

     

       5
       5
       +
       , backports-strenum

     

       5
       6
        
       , boto3

     

       6
       7
        
       , buildPythonPackage

     

       7
       8
        
       , fetchFromGitHub

     
···

       15
       16
        
       

     

       16
       17
        
       buildPythonPackage rec {

     

       17
       18
        
         pname = "pyoverkiz";

     

       18
       18
       -
         version = "1.9.1";

     

       19
       19
       +
         version = "1.10.1";

     

       19
       20
        
         format = "pyproject";

     

       20
       21
        
       

     

       21
       22
        
         disabled = pythonOlder "3.7";

     
···

       24
       25
        
           owner = "iMicknl";

     

       25
       26
        
           repo = "python-overkiz-api";

     

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

     

       27
       27
       -
           hash = "sha256-03tbWCkSAG/aE6hsPxCPuGRFPTiMgkp/tCzWScPW8YE=";

     

       28
       28
       +
           hash = "sha256-tb0xU1H1VrWTuObCg1+mFkzawAzrknO3fER7cN2St7U=";

     

       28
       29
        
         };

     

       29
       30
        
       

     

       30
       31
        
         postPatch = ''

     
···

       37
       38
        
         ];

     

       38
       39
        
       

     

       39
       40
        
         propagatedBuildInputs = [

     

       40
       40
       -
           attrs

     

       41
       41
        
           aiohttp

     

       42
       42
       +
           attrs

     

       42
       43
        
           backoff

     

       43
       43
       -
           pyhumps

     

       44
       44
       +
           backports-strenum

     

       44
       45
        
           boto3

     

       46
       46
       +
           pyhumps

     

       45
       47
        
           warrant-lite

     

       46
       48
        
         ];

     

       47
       49

+2 -2

pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "pysigma-backend-elasticsearch";

     

       13
       13
       -
         version = "1.0.4";

     

       13
       13
       +
         version = "1.0.5";

     

       14
       14
        
         format = "pyproject";

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.8";

     
···

       19
       19
        
           owner = "SigmaHQ";

     

       20
       20
        
           repo = "pySigma-backend-elasticsearch";

     

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

     

       22
       22
       -
           hash = "sha256-HHg5WNnWm7/4yhKRNMxskZzOgyH5qTjRxh55g8nkCb8=";

     

       22
       22
       +
           hash = "sha256-a+2RW+S0Tpf1odfLi0JEdbxfJehF+HI/sHc4QX7lQ+4=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         postPatch = ''

+22 -3

pkgs/development/python-modules/pytest-raises/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       +
       , pytest

     

       4
       5
        
       , pytestCheckHook

     

       6
       6
       +
       , pythonOlder

     

       5
       7
        
       }:

     

       6
       8
        
       

     

       7
       9
        
       buildPythonPackage rec {

     

       8
       10
        
         pname = "pytest-raises";

     

       9
       11
        
         version = "0.11";

     

       12
       12
       +
         format = "setuptools";

     

       13
       13
       +
       

     

       14
       14
       +
         disabled = pythonOlder "3.7";

     

       10
       15
        
       

     

       11
       16
        
         src = fetchFromGitHub {

     

       12
       17
        
           owner = "Lemmons";

     

       13
       18
        
           repo = pname;

     

       14
       14
       -
           rev = version;

     

       15
       15
       -
           sha256 = "0gbb4kml2qv7flp66i73mgb4qihdaybb6c96b5dw3mhydhymcsy2";

     

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

     

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

     

       16
       21
        
         };

     

       22
       22
       +
       

     

       23
       23
       +
         buildInputs = [

     

       24
       24
       +
           pytest

     

       25
       25
       +
         ];

     

       17
       26
        
       

     

       18
       27
        
         nativeCheckInputs = [

     

       19
       28
        
           pytestCheckHook

     

       20
       29
        
         ];

     

       21
       30
        
       

     

       22
       22
       -
         pythonImportsCheck = [ "pytest_raises" ];

     

       31
       31
       +
         pythonImportsCheck = [

     

       32
       32
       +
           "pytest_raises"

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         disabledTests = [

     

       36
       36
       +
           # Failed: nomatch: '*::test_pytest_mark_raises_unexpected_exception FAILED*'

     

       37
       37
       +
           # https://github.com/Lemmons/pytest-raises/issues/30

     

       38
       38
       +
           "test_pytest_mark_raises_unexpected_exception"

     

       39
       39
       +
           "test_pytest_mark_raises_unexpected_match"

     

       40
       40
       +
           "test_pytest_mark_raises_parametrize"

     

       41
       41
       +
         ];

     

       23
       42
        
       

     

       24
       43
        
         meta = with lib; {

     

       25
       44
        
           description = "An implementation of pytest.raises as a pytest.mark fixture";

+21 -9

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

···

       53
       53
        
       

     

       54
       54
        
       buildPythonPackage rec {

     

       55
       55
        
         pname = "qcodes";

     

       56
       56
       -
         version = "0.39.0";

     

       56
       56
       +
         version = "0.39.1";

     

       57
       57
        
         format = "pyproject";

     

       58
       58
        
       

     

       59
       59
        
         disabled = pythonOlder "3.9";

     

       60
       60
        
       

     

       61
       61
        
         src = fetchPypi {

     

       62
       62
        
           inherit pname version;

     

       63
       63
       -
           sha256 = "sha256-zKn9LN7FBxKUfYSxUV1O6fB2s/B5bQpGDZTrK4DcxmU=";

     

       63
       63
       +
           sha256 = "sha256-2gJ/WeynabiGB1Z66+qaUbf6/1wogf/XjIE2mCAXUZY=";

     

       64
       64
        
         };

     

       65
       65
        
       

     

       66
       66
        
         postPatch = ''

     
···

       78
       78
        
           broadbean

     

       79
       79
        
           h5netcdf

     

       80
       80
        
           h5py

     

       81
       81
       +
           ipykernel

     

       82
       82
       +
           ipython

     

       81
       83
        
           ipywidgets

     

       82
       82
       -
           ipykernel

     

       83
       84
        
           jsonschema

     

       84
       85
        
           matplotlib

     

       85
       86
        
           numpy

     
···

       87
       88
        
           opencensus-ext-azure

     

       88
       89
        
           packaging

     

       89
       90
        
           pandas

     

       91
       91
       +
           pillow

     

       90
       92
        
           pyvisa

     

       93
       93
       +
           rsa

     

       91
       94
        
           ruamel-yaml

     

       92
       95
        
           tabulate

     

       96
       96
       +
           tqdm

     

       93
       97
        
           typing-extensions

     

       94
       94
       -
           tqdm

     

       95
       98
        
           uncertainties

     

       96
       99
        
           websockets

     

       97
       100
        
           wrapt

     

       98
       101
        
           xarray

     

       99
       99
       -
           ipython

     

       100
       100
       -
           pillow

     

       101
       101
       -
           rsa

     

       102
       102
        
         ] ++ lib.optionals (pythonOlder "3.10") [

     

       103
       103
        
           importlib-metadata

     

       104
       104
        
         ];

     
···

       139
       139
        
         ];

     

       140
       140
        
       

     

       141
       141
        
         disabledTestPaths = [

     

       142
       142
       -
           # depends on qcodes-loop, causing a cyclic dependency

     

       142
       142
       +
           # Test depends on qcodes-loop, causing a cyclic dependency

     

       143
       143
        
           "qcodes/tests/dataset/measurement/test_load_legacy_data.py"

     

       144
       144
        
         ];

     

       145
       145
        
       

     

       146
       146
       +
         disabledTests = [

     

       147
       147
       +
           # Tests are time-sensitive and power-consuming

     

       148
       148
       +
           # Those tests fails repeatably

     

       149
       149
       +
           "test_access_channels_by_slice"

     

       150
       150
       +
           "test_do1d_additional_setpoints_shape"

     

       151
       151
       +
           "test_dond_1d_additional_setpoints_shape"

     

       152
       152
       +
           "test_field_limits"

     

       153
       153
       +
           "test_get_array_in_scalar_param_data"

     

       154
       154
       +
           "test_get_parameter_data"

     

       155
       155
       +
           "test_ramp_safely"

     

       156
       156
       +
         ];

     

       157
       157
       +
       

     

       146
       158
        
         pythonImportsCheck = [

     

       147
       159
        
           "qcodes"

     

       148
       160
        
         ];

     
···

       152
       164
        
         '';

     

       153
       165
        
       

     

       154
       166
        
         meta = with lib; {

     

       155
       155
       -
           homepage = "https://qcodes.github.io/Qcodes/";

     

       156
       167
        
           description = "Python-based data acquisition framework";

     

       168
       168
       +
           homepage = "https://qcodes.github.io/Qcodes/";

     

       157
       169
        
           changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/v${version}";

     

       158
       170
        
           license = licenses.mit;

     

       159
       171
        
           maintainers = with maintainers; [ evilmav ];

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "rns";

     

       12
       12
       -
         version = "0.5.6";

     

       12
       12
       +
         version = "0.5.7";

     

       13
       13
        
         format = "setuptools";

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.7";

     
···

       18
       18
        
           owner = "markqvist";

     

       19
       19
        
           repo = "Reticulum";

     

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

     

       21
       21
       -
           hash = "sha256-s/rOU9FEWdb0vmRsMq/yPkP/ZTNc5wjlfdB0V+ltryQ=";

     

       21
       21
       +
           hash = "sha256-0WNgJKhxK4WjYQ0n7ofqrRxf4m9uWn2ygcZiv3uhrhM=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         propagatedBuildInputs = [

+3 -3

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

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "rokuecp";

     

       20
       20
       -
         version = "0.18.0";

     

       20
       20
       +
         version = "0.18.1";

     

       21
       21
        
         format = "pyproject";

     

       22
       22
        
       

     

       23
       23
        
         disabled = pythonOlder "3.9";

     
···

       26
       26
        
           owner = "ctalkington";

     

       27
       27
        
           repo = "python-rokuecp";

     

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

     

       29
       29
       -
           hash = "sha256-YvJ1+o7/S/QNROedYGsP8m99Dr+WpAkfe5YPEN+2ZhU=";

     

       29
       29
       +
           hash = "sha256-0ArnP9xITVpbIfDrsNK3ukmeJBdd6SE3tnDwCLWSHMo=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         nativeBuildInputs = [

     
···

       52
       52
        
         postPatch = ''

     

       53
       53
        
           substituteInPlace pyproject.toml \

     

       54
       54
        
             --replace 'version = "0.0.0"' 'version = "${version}"' \

     

       55
       55
       -
             --replace " --cov" ""

     

       55
       55
       +
             --replace "--cov" ""

     

       56
       56
        
         '';

     

       57
       57
        
       

     

       58
       58
        
         disabledTests = [

+9 -4

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

···

       17
       17
        
       , deepmerge

     

       18
       18
        
       , fastjsonschema

     

       19
       19
        
       , hexdump

     

       20
       20
       +
       , importlib-metadata

     

       20
       21
        
       , jinja2

     

       21
       22
        
       , libusbsio

     

       22
       23
        
       , oscrypto

     

       23
       24
        
       , pycryptodome

     

       25
       25
       +
       , pyftdi

     

       24
       26
        
       , pylink-square

     

       25
       27
        
       , pyocd

     

       26
       28
        
       , pypemicro

     
···

       34
       36
        
       

     

       35
       37
        
       buildPythonPackage rec {

     

       36
       38
        
         pname = "spsdk";

     

       37
       37
       -
         version = "1.10.1";

     

       39
       39
       +
         version = "1.11.0";

     

       38
       40
        
       

     

       39
       41
        
         src = fetchFromGitHub {

     

       40
       40
       -
           owner = "NXPmicro";

     

       42
       42
       +
           owner = "nxp-mcuxpresso";

     

       41
       43
        
           repo = pname;

     

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

     

       43
       43
       -
           hash = "sha256-2UTgVHqFJqizJ6mDT7+PFec3bQexcBG6v8X0E5Ai4Hc=";

     

       45
       45
       +
           hash = "sha256-B3qedAXSG3A8rcWu1O2GnZ1ZqHN+7fQK43qXzGnDEY0=";

     

       44
       46
        
         };

     

       45
       47
        
       

     

       46
       48
        
         nativeBuildInputs = [

     
···

       92
       94
        
         ];

     

       93
       95
        
       

     

       94
       96
        
         nativeCheckInputs = [

     

       97
       97
       +
           importlib-metadata

     

       98
       98
       +
           pyftdi

     

       95
       99
        
           pytestCheckHook

     

       96
       100
        
           voluptuous

     

       97
       101
        
         ];

     
···

       99
       103
        
         pythonImportsCheck = [ "spsdk" ];

     

       100
       104
        
       

     

       101
       105
        
         meta = with lib; {

     

       106
       106
       +
           changelog = "https://github.com/nxp-mcuxpresso/spsdk/blob/${src.rev}/docs/release_notes.rst";

     

       102
       107
        
           description = "NXP Secure Provisioning SDK";

     

       103
       103
       -
           homepage = "https://github.com/NXPmicro/spsdk";

     

       108
       108
       +
           homepage = "https://github.com/nxp-mcuxpresso/spsdk";

     

       104
       109
        
           license = licenses.bsd3;

     

       105
       110
        
           maintainers = with maintainers; [ frogamic sbruder ];

     

       106
       111
        
         };

+2

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

···

       53
       53
        
           homepage = "https://github.com/cgarciae/treeo";

     

       54
       54
        
           license = licenses.mit;

     

       55
       55
        
           maintainers = with maintainers; [ ndl ];

     

       56
       56
       +
           # obsolete as of 2023-02-27 and not updated for more than a year as of 2023-08

     

       57
       57
       +
           broken = true;

     

       56
       58
        
         };

     

       57
       59
        
       }

+3 -3

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

···

       52
       52
        
       , unittestCheckHook

     

       53
       53
        
       }:

     

       54
       54
        
       let

     

       55
       55
       -
         version = "5.5.1";

     

       55
       55
       +
         version = "6.0.0";

     

       56
       56
        
         api = [ aiohttp fastapi uvicorn ];

     

       57
       57
        
         # cloud = [ apache-libcloud ];

     

       58
       58
        
         console = [ rich ];

     
···

       104
       104
        
         src = fetchFromGitHub {

     

       105
       105
        
           owner = "neuml";

     

       106
       106
        
           repo = "txtai";

     

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

     

       108
       108
       -
           hash = "sha256-h6TwWzLYfFg5x2QMIstAZ5pkxfHobBU+b4gb0HiayzY=";

     

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

     

       108
       108
       +
           hash = "sha256-lGRdSUSQGdxe+I4WrUkE4hIyyJ1HcFn3cXO3zd27fsM=";

     

       109
       109
        
         };

     

       110
       110
        
       

     

       111
       111
        
         nativeBuildInputs = [

+9

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

···

       28
       28
        
           hash = "sha256-UJIv15rqL0dRqOBAj/ENJmK9DIu/qEdVppnzutopeLI=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
       +
         patches = [

     

       32
       32
       +
           # https://github.com/tiangolo/typer/pull/651

     

       33
       33
       +
           (fetchpatch {

     

       34
       34
       +
             name = "unpin-flit-core-dependency.patch";

     

       35
       35
       +
             url = "https://github.com/tiangolo/typer/commit/78a0ee2eec9f54ad496420e177fdaad84984def1.patch";

     

       36
       36
       +
             hash = "sha256-VVUzFvF2KCXXkCfCU5xu9acT6OLr+PlQQPeVGONtU4A=";

     

       37
       37
       +
           })

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       31
       40
        
         nativeBuildInputs = [

     

       32
       41
        
           flit-core

     

       33
       42
        
         ];

+9

pkgs/development/python-modules/vulcan-api/default.nix

···

       7
       7
        
       , fetchFromGitHub

     

       8
       8
        
       , pyopenssl

     

       9
       9
        
       , pythonOlder

     

       10
       10
       +
       , pythonRelaxDepsHook

     

       10
       11
        
       , pytz

     

       11
       12
        
       , related

     

       12
       13
        
       , requests

     
···

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

     

       28
       29
        
           hash = "sha256-5Tj611p4wYn7GjoCtCTRhUZkKyAJglHcci76ciVFWik=";

     

       29
       30
        
         };

     

       31
       31
       +
       

     

       32
       32
       +
         pythonRemoveDeps = [

     

       33
       33
       +
           "faust-cchardet"

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         nativeBuildInputs = [

     

       37
       37
       +
           pythonRelaxDepsHook

     

       38
       38
       +
         ];

     

       30
       39
        
       

     

       31
       40
        
         propagatedBuildInputs = [

     

       32
       41
        
           aenum

+61 -41

pkgs/development/tools/build-managers/buck2/default.nix

···

       2
       2
        
       , testers, buck2 # for passthru.tests

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
       -
       let

     

       6
       6
       -
         # NOTE (aseipp): buck2 uses a precompiled binary build for good reason — the

     

       7
       7
       -
         # upstream codebase extensively uses unstable `rustc` nightly features, and as

     

       8
       8
       -
         # a result can't be built upstream in any sane manner. it is only ever tested

     

       9
       9
       -
         # and integrated against a single version of the compiler, which produces all

     

       10
       10
       -
         # usable binaries. you shouldn't try to workaround this or get clever and

     

       11
       11
       -
         # think you can patch it to work; just accept it for now. it is extremely

     

       12
       12
       -
         # unlikely buck2 will build with a stable compiler anytime soon; see related

     

       13
       13
       -
         # upstream issues:

     

       14
       14
       -
         #

     

       15
       15
       -
         #   - NixOS/nixpkgs#226677

     

       16
       16
       -
         #   - NixOS/nixpkgs#232471

     

       17
       17
       -
         #   - facebook/buck2#265

     

       18
       18
       -
         #   - facebook/buck2#322

     

       19
       19
       -
         #

     

       20
       20
       -
         # worth noting: it *is* possible to build buck2 from source using

     

       21
       21
       -
         # buildRustPackage, and it works fine, but only if you are using flakes and

     

       22
       22
       -
         # can import `rust-overlay` from somewhere else to vendor your compiler. See

     

       23
       23
       -
         # nixos/nixpkgs#226677 for more information about that.

     

       5
       5
       +
       # NOTE (aseipp): buck2 uses a precompiled binary build for good reason — the

     

       6
       6
       +
       # upstream codebase extensively uses unstable `rustc` nightly features, and as a

     

       7
       7
       +
       # result can't be built upstream in any sane manner. it is only ever tested and

     

       8
       8
       +
       # integrated against a single version of the compiler, which produces all usable

     

       9
       9
       +
       # binaries. you shouldn't try to workaround this or get clever and think you can

     

       10
       10
       +
       # patch it to work; just accept it for now. it is extremely unlikely buck2 will

     

       11
       11
       +
       # build with a stable compiler anytime soon; see related upstream issues:

     

       12
       12
       +
       #

     

       13
       13
       +
       #   - NixOS/nixpkgs#226677

     

       14
       14
       +
       #   - NixOS/nixpkgs#232471

     

       15
       15
       +
       #   - facebook/buck2#265

     

       16
       16
       +
       #   - facebook/buck2#322

     

       17
       17
       +
       #

     

       18
       18
       +
       # worth noting: it *is* possible to build buck2 from source using

     

       19
       19
       +
       # buildRustPackage, and it works fine, but only if you are using flakes and can

     

       20
       20
       +
       # import `rust-overlay` from somewhere else to vendor your compiler. See

     

       21
       21
       +
       # nixos/nixpkgs#226677 for more information about that.

     

       24
       22
        
       

     

       25
       25
       -
         # map our platform name to the rust toolchain suffix

     

       26
       26
       -
         suffix = {

     

       27
       27
       -
           x86_64-darwin  = "x86_64-apple-darwin";

     

       28
       28
       -
           aarch64-darwin = "aarch64-apple-darwin";

     

       29
       29
       -
           x86_64-linux   = "x86_64-unknown-linux-musl";

     

       30
       30
       -
           aarch64-linux  = "aarch64-unknown-linux-musl";

     

       31
       31
       -
         }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

     

       23
       23
       +
       # NOTE (aseipp): this expression is mostly automated, and you are STRONGLY

     

       24
       24
       +
       # RECOMMENDED to use to nix-update for updating this expression when new

     

       25
       25
       +
       # releases come out, which runs the sibling `update.sh` script.

     

       26
       26
       +
       #

     

       27
       27
       +
       # from the root of the nixpkgs git repository, run:

     

       28
       28
       +
       #

     

       29
       29
       +
       #    nix-shell maintainers/scripts/update.nix \

     

       30
       30
       +
       #      --argstr commit true \

     

       31
       31
       +
       #      --argstr package buck2

     

       32
       32
        
       

     

       33
       33
       -
         allHashes = builtins.fromJSON (builtins.readFile ./hashes.json);

     

       33
       33
       +
       let

     

       34
       34
       +
       

     

       35
       35
       +
         # build hashes, which correspond to the hashes of the precompiled binaries

     

       36
       36
       +
         # procued by GitHub Actions. this also includes the hash for a download of a

     

       37
       37
       +
         # compatible buck2-prelude

     

       38
       38
       +
         buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json);

     

       34
       39
        
       

     

       35
       40
        
         # our version of buck2; this should be a git tag

     

       36
       36
       -
         buck2-version = "2023-08-01";

     

       41
       41
       +
         version = "2023-08-15";

     

       42
       42
       +
       

     

       43
       43
       +
         # the platform-specific, statically linked binary — which is also

     

       44
       44
       +
         # zstd-compressed

     

       37
       45
        
         src =

     

       38
       46
        
           let

     

       39
       39
       -
             hash = allHashes."${stdenv.hostPlatform.system}";

     

       40
       40
       -
             url = "https://github.com/facebook/buck2/releases/download/${buck2-version}/buck2-${suffix}.zst";

     

       41
       41
       -
           in fetchurl { inherit url hash; };

     

       47
       47
       +
             suffix = {

     

       48
       48
       +
               # map our platform name to the rust toolchain suffix

     

       49
       49
       +
               # NOTE (aseipp): must be synchronized with update.sh!

     

       50
       50
       +
               x86_64-darwin  = "x86_64-apple-darwin";

     

       51
       51
       +
               aarch64-darwin = "aarch64-apple-darwin";

     

       52
       52
       +
               x86_64-linux   = "x86_64-unknown-linux-musl";

     

       53
       53
       +
               aarch64-linux  = "aarch64-unknown-linux-musl";

     

       54
       54
       +
             }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

     

       55
       55
       +
       

     

       56
       56
       +
             name = "buck2-${version}-${suffix}.zst";

     

       57
       57
       +
             hash = buildHashes."${stdenv.hostPlatform.system}";

     

       58
       58
       +
             url = "https://github.com/facebook/buck2/releases/download/${version}/buck2-${suffix}.zst";

     

       59
       59
       +
           in fetchurl { inherit name url hash; };

     

       42
       60
        
       

     

       43
       43
       -
         # compatible version of buck2 prelude; a git revision in the buck2-prelude repository

     

       44
       44
       -
         buck2-prelude = "acf49faaa61fd6ad9facd9e1418eed514bbb2ec8";

     

       61
       61
       +
         # compatible version of buck2 prelude; this is exported via passthru.prelude

     

       62
       62
       +
         # for downstream consumers to use when they need to automate any kind of

     

       63
       63
       +
         # tooling

     

       45
       64
        
         prelude-src =

     

       46
       65
        
           let

     

       47
       47
       -
             hash = allHashes."_prelude";

     

       48
       48
       -
             url = "https://github.com/facebook/buck2-prelude/archive/${buck2-prelude}.tar.gz";

     

       49
       49
       -
           in fetchurl { inherit url hash; };

     

       66
       66
       +
             prelude-hash = "40d6fffd01f224d25a62d982f4a3f00b275a5677";

     

       67
       67
       +
             name = "buck2-prelude-${version}.tar.gz";

     

       68
       68
       +
             hash = buildHashes."_prelude";

     

       69
       69
       +
             url = "https://github.com/facebook/buck2-prelude/archive/${prelude-hash}.tar.gz";

     

       70
       70
       +
           in fetchurl { inherit name url hash; };

     

       50
       71
        
       

     

       51
       51
       -
       in

     

       52
       52
       -
       stdenv.mkDerivation rec {

     

       72
       72
       +
       in stdenv.mkDerivation {

     

       53
       73
        
         pname = "buck2";

     

       54
       54
       -
         version = "unstable-${buck2-version}"; # TODO (aseipp): kill 'unstable' once a non-prerelease is made

     

       74
       74
       +
         version = "unstable-${version}"; # TODO (aseipp): kill 'unstable' once a non-prerelease is made

     

       55
       75
        
         inherit src;

     

       56
       76
        
       

     

       57
       77
        
         nativeBuildInputs = [ zstd ];

     
···

       88
       108
        
         meta = with lib; {

     

       89
       109
        
           description = "Fast, hermetic, multi-language build system";

     

       90
       110
        
           homepage = "https://buck2.build";

     

       91
       91
       -
           changelog = "https://github.com/facebook/buck2/releases/tag/${buck2-version}";

     

       111
       111
       +
           changelog = "https://github.com/facebook/buck2/releases/tag/${version}";

     

       92
       112
        
           license = with licenses; [ asl20 /* or */ mit ];

     

       93
       93
       -
           mainProgram = pname;

     

       113
       113
       +
           mainProgram = "buck2";

     

       94
       114
        
           maintainers = with maintainers; [ thoughtpolice ];

     

       95
       115
        
           platforms = [

     

       96
       116
        
             "x86_64-linux" "aarch64-linux"

+5 -5

pkgs/development/tools/build-managers/buck2/hashes.json

···

       1
       1
        
       { "_comment": "@generated by pkgs/development/tools/build-managers/buck2/update.sh"

     

       2
       2
       -
       , "_prelude": "sha256-SkCsVymQL/i8tUvKoLVtOQRYRm3zuF+WOFnbCggQwes="

     

       3
       3
       -
       , "x86_64-linux": "sha256-wZULK2FPZ4GtQ5MMQmgfmtbMHJ7sPbue2RdVY0dmRuE="

     

       4
       4
       -
       , "x86_64-darwin": "sha256-FmayArw2gswKjAEv0AzpFZNiXNx3GmJnPwH9g+Y/BGU="

     

       5
       5
       -
       , "aarch64-linux": "sha256-3M1dRIFU0CwoVCbmq3oghhz51wW37melzt9hdIHqzzY="

     

       6
       6
       -
       , "aarch64-darwin": "sha256-UAe73UNDSLL8OHqzAd+NOwwtW4bpVBz/aL4wdy3VuYg="

     

       2
       2
       +
       , "_prelude": "sha256-TaQ31JvG4ihVn3n1HLuxf9D6Kq5KOb6xRMVMt2odoqY="

     

       3
       3
       +
       , "x86_64-linux": "sha256-3Ae0e/J4GI7qPZnN36Ss7qImY8JWmETkbSyKSuGbpbg="

     

       4
       4
       +
       , "x86_64-darwin": "sha256-GOMuNFTwX8uf65OJ5o54u14T/47MSp/5g6crTJDa6mk="

     

       5
       5
       +
       , "aarch64-linux": "sha256-4oZXiPDu0zlQtlFTH1uH7OHKaNVVUjiQeZYbtc39yi0="

     

       6
       6
       +
       , "aarch64-darwin": "sha256-vPgK9cYjBz0d41n56Cxqjly5FAnr/vr0GsoqUuOIVQo="

     

       7
       7
        
       }

+2 -2

pkgs/development/tools/build-managers/buck2/update.sh

···

       41
       41
        
       echo "}" >> "$HFILE"

     

       42
       42
        
       

     

       43
       43
        
       sed -i \

     

       44
       44
       -
         's/buck2-version\s*=\s*".*";/buck2-version = "'"$VERSION"'";/' \

     

       44
       44
       +
         '0,/version\s*=\s*".*";/s//version = "'"$VERSION"'";/' \

     

       45
       45
        
         "$NFILE"

     

       46
       46
        
       

     

       47
       47
        
       sed -i \

     

       48
       48
       -
         's/buck2-prelude\s*=\s*".*";/buck2-prelude = "'"$PRELUDE_HASH"'";/' \

     

       48
       48
       +
         '0,/prelude-hash\s*=\s*".*";/s//prelude-hash = "'"$PRELUDE_HASH"'";/' \

     

       49
       49
        
         "$NFILE"

     

       50
       50
        
       

     

       51
       51
        
       echo "Done; wrote $HFILE and updated version in $NFILE."

+4 -4

pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix

···

       7
       7
        
       

     

       8
       8
        
       buildGoModule rec {

     

       9
       9
        
         pname = "forgejo-actions-runner";

     

       10
       10
       -
         version = "2.3.0";

     

       10
       10
       +
         version = "2.4.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitea {

     

       13
       13
        
           domain = "codeberg.org";

     

       14
       14
        
           owner = "forgejo";

     

       15
       15
        
           repo = "runner";

     

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

     

       17
       17
       -
           hash = "sha256-ZIhUlTGeNuJSrBVXYjAz/YHYmkR3wg1LAe0uUabEQRQ=";

     

       17
       17
       +
           hash = "sha256-EEwXo2MvdBlSMho4rrYD4wXLccS/30NbCuxO0CUktgE=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         vendorHash = "sha256-OauNDA0mkarSWrZBfJE/SYspa3CTEYKpLRMvbPdIoRo=";

     

       20
       20
       +
         vendorHash = "sha256-FspNmiphGHSeZFmdlWIDsEUrCc8THfb0Wm67cMCTtHI=";

     

       21
       21
        
       

     

       22
       22
        
         ldflags = [

     

       23
       23
        
           "-s"

     
···

       25
       25
        
           "-X gitea.com/gitea/act_runner/internal/pkg/ver.version=${src.rev}"

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
       -
         doCheck = false; # Test try to lookuyp code.forgejo.org.

     

       28
       28
       +
         doCheck = false; # Test try to lookup code.forgejo.org.

     

       29
       29
        
       

     

       30
       30
        
         passthru.tests.version = testers.testVersion {

     

       31
       31
        
           package = forgejo-actions-runner;

+3 -3

pkgs/development/tools/database/sqlc/default.nix

···

       1
       1
        
       { lib, buildGoModule, fetchFromGitHub }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         version = "1.19.1";

     

       4
       4
       +
         version = "1.20.0";

     

       5
       5
        
       in

     

       6
       6
        
       buildGoModule {

     

       7
       7
        
         pname = "sqlc";

     
···

       11
       11
        
           owner = "kyleconroy";

     

       12
       12
        
           repo = "sqlc";

     

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

     

       14
       14
       -
           sha256 = "sha256-xZogHQ44amdhFewovFd1TWrul0wlofUqo46Ay13Mnig=";

     

       14
       14
       +
           sha256 = "sha256-ITW5jIlNoiW7sl6s5jCVRELglauZzSPmAj3PXVpdIGA=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         proxyVendor = true;

     

       18
       18
       -
         vendorHash = "sha256-owH+Gd6K+RzBRhWEs99qQLXV3UWysEkLinEFvzSzXIU=";

     

       18
       18
       +
         vendorHash = "sha256-5ZJPHdjg3QCB/hJ+C7oXSfzBfg0fZ+kFyMXqC7KpJmY=";

     

       19
       19
        
       

     

       20
       20
        
         subPackages = [ "cmd/sqlc" ];

     

       21
       21

+30

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , zig_0_11

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       stdenv.mkDerivation {

     

       8
       8
       +
         pname = "ztags";

     

       9
       9
       +
         version = "unstable-2023-08-03";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchFromGitHub {

     

       12
       12
       +
           owner = "gpanders";

     

       13
       13
       +
           repo = "ztags";

     

       14
       14
       +
           rev = "6ef039047f6580772c5ff97e8770d919dc07a4fa";

     

       15
       15
       +
           hash = "sha256-WuDEHzNU3I4VPHEAkRdIUE5LPbQEKbUnITdFutGV58Y=";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         nativeBuildInputs = [

     

       19
       19
       +
           zig_0_11.hook

     

       20
       20
       +
         ];

     

       21
       21
       +
       

     

       22
       22
       +
         meta = with lib; {

     

       23
       23
       +
           description = "Generate tags files for Zig projects";

     

       24
       24
       +
           homepage = "https://github.com/gpanders/ztags";

     

       25
       25
       +
           license = licenses.mit;

     

       26
       26
       +
           maintainers = with maintainers; [ figsoda ];

     

       27
       27
       +
           mainProgram = "ztags";

     

       28
       28
       +
           inherit (zig_0_11.meta) platforms;

     

       29
       29
       +
         };

     

       30
       30
       +
       }

+3 -3

pkgs/development/tools/operator-sdk/default.nix

···

       7
       7
        
       

     

       8
       8
        
       buildGoModule rec {

     

       9
       9
        
         pname = "operator-sdk";

     

       10
       10
       -
         version = "1.30.0";

     

       10
       10
       +
         version = "1.31.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "operator-framework";

     

       14
       14
        
           repo = pname;

     

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

     

       16
       16
       -
           hash = "sha256-mDjBu25hOhm3FrUDsFq1rjBn58K91Bao8gqN2heZ9ps=";

     

       16
       16
       +
           hash = "sha256-v/7nqZg/lwiK2k92kQWSZCSjEZhTAQHCGBcTfxQX2r0=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         vendorHash = "sha256-QfTWjSsWpbbGgKrv4U2E6jA6eAT4wnj0ixpUqDxtsY8=";

     

       19
       19
       +
         vendorHash = "sha256-geKWTsDLx5drTleTnneg2JIbe5sMS5JUQxTX9Bcm+IQ=";

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [

     

       22
       22
        
           makeWrapper

+4 -4

pkgs/development/tools/reindeer/default.nix

···

       11
       11
        
       

     

       12
       12
        
       rustPlatform.buildRustPackage rec {

     

       13
       13
        
         pname = "reindeer";

     

       14
       14
       -
         version = "unstable-2023-07-14";

     

       14
       14
       +
         version = "unstable-2023-08-14";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "facebookincubator";

     

       18
       18
        
           repo = pname;

     

       19
       19
       -
           rev = "381fe232bcab77b432e2f29dbbd685e013d19c76";

     

       20
       20
       -
           sha256 = "sha256-xyoGmleJAZA/tdB2Q11vPe9rcn74SCBPiTR//Cpx1Lw=";

     

       19
       19
       +
           rev = "7ab6fc86006c3a9c7d46775d23474f86b1d29881";

     

       20
       20
       +
           sha256 = "sha256-wn5MwBDOKnHIOVYZK68GOjvX7dkFaWJuLJOxgUR6bok=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         cargoSha256 = "sha256-GVOkZcleKakXE58LbJthAa5ZWArKkIok/RawLXcwGPw=";

     

       23
       23
       +
         cargoSha256 = "sha256-MVQVYiJ6512wahVG8ONtZB+jgXXEGGFnE89VHGa/77U=";

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [ pkg-config ];

     

       26
       26
        
         buildInputs =

+3 -3

pkgs/development/tools/viceroy/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "viceroy";

     

       5
       5
       -
         version = "0.6.1";

     

       5
       5
       +
         version = "0.7.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "fastly";

     

       9
       9
        
           repo = pname;

     

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

     

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

     

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

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = lib.optional stdenv.isDarwin Security;

     

       15
       15
        
       

     

       16
       16
       -
         cargoHash = "sha256-0Qr40hMA59WaHinkUkebF0CwPy3aublgfzSz1er7Uws=";

     

       16
       16
       +
         cargoHash = "sha256-PC2StxMefsiKaY9fXIG4167G9SoWlbmJBDGwrFBa4os=";

     

       17
       17
        
       

     

       18
       18
        
         cargoTestFlags = [

     

       19
       19
        
           "--package viceroy-lib"

+3 -3

pkgs/games/forge-mtg/default.nix

···

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       let

     

       11
       11
       -
         version = "1.6.56";

     

       11
       11
       +
         version = "1.6.57";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "Card-Forge";

     

       15
       15
        
           repo = "forge";

     

       16
       16
        
           rev = "forge-${version}";

     

       17
       17
       -
           hash = "sha256-VB/ToTq1XwHPEUNmbocwUoCP4DfyAFdlRAwxrx4tNJU=";

     

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

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         # launch4j downloads and runs a native binary during the package phase.

     
···

       27
       27
        
       

     

       28
       28
        
         # Tests need a running Xorg.

     

       29
       29
        
         mvnParameters = "-DskipTests";

     

       30
       30
       -
         mvnHash = "sha256-ajrHnaiJS7ZnR9BjLaXK2bnAKCp5UWQqYpjWbz3z6bw=";

     

       30
       30
       +
         mvnHash = "sha256-QK9g0tG75lIhEtf4jW03N32YbD9Fe5iI0JTuqmCTtnE=";

     

       31
       31
        
       

     

       32
       32
        
         nativeBuildInputs = [ makeWrapper ];

     

       33
       33

+2 -2

pkgs/games/path-of-building/default.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub, runCommand, unzip, meson, ninja, pkg-config, qtbase, qttools, wrapQtAppsHook, luajit }:

     

       2
       2
        
       let

     

       3
       3
       -
         dataVersion = "2.31.0";

     

       3
       3
       +
         dataVersion = "2.31.1";

     

       4
       4
        
         frontendVersion = "unstable-2023-04-09";

     

       5
       5
        
       in

     

       6
       6
        
       stdenv.mkDerivation {

     
···

       19
       19
        
             owner = "PathOfBuildingCommunity";

     

       20
       20
        
             repo = "PathOfBuilding";

     

       21
       21
        
             rev = "v${dataVersion}";

     

       22
       22
       -
             hash = "sha256-romuFNd80TuskJUp/UqmI3hPjVMxE/xoBTpQVCu5MBI=";

     

       22
       22
       +
             hash = "sha256-K/u8NYUv4U/XgGP/LkYMRzwmw1LFn25OW6bmvqqRpVQ=";

     

       23
       23
        
           };

     

       24
       24
        
       

     

       25
       25
        
           nativeBuildInputs = [ unzip ];

+4 -4

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

···

       5
       5
        
       in

     

       6
       6
        
       stdenv.mkDerivation {

     

       7
       7
        
         pname = "rtw88";

     

       8
       8
       -
         version = "unstable-2022-11-05";

     

       8
       8
       +
         version = "unstable-2023-07-23";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "lwfinger";

     

       12
       12
        
           repo = "rtw88";

     

       13
       13
       -
           rev = "c0dfe571fd7b307e036f186ef5711b4c0d9f3f08";

     

       14
       14
       -
           sha256 = "1gc5nv5pyrfag826z36vsrbirg6iww99yx45pcgpp7rmrpbwamvg";

     

       13
       13
       +
           rev = "9b6fe04a741a6b0a1edc5ca134927784bff033a5";

     

       14
       14
       +
           hash = "sha256-OzaIy+WTrljwAhC73wEIRUXrkz1NrGNJAS3zofQyV6E=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = kernel.moduleBuildDependencies;

     
···

       30
       30
        
         '';

     

       31
       31
        
       

     

       32
       32
        
         meta = with lib; {

     

       33
       33
       -
           description = "The newest Realtek rtlwifi codes";

     

       33
       33
       +
           description = "Backport of the latest Realtek RTW88 driver from wireless-next for older kernels";

     

       34
       34
        
           homepage = "https://github.com/lwfinger/rtw88";

     

       35
       35
        
           license = with licenses; [ bsd3 gpl2Only ];

     

       36
       36
        
           maintainers = with maintainers; [ tvorog atila ];

+9 -5

pkgs/servers/invidious/default.nix

···

       97
       97
        
           cp -r config/sql $out/share/invidious/config

     

       98
       98
        
         '';

     

       99
       99
        
       

     

       100
       100
       -
         # Invidious tries to open config/config.yml and connect to the database, even

     

       101
       101
       -
         # when running --help. This specifies a minimal configuration in an

     

       102
       102
       -
         # environment variable. Even though the database is bogus, --help still

     

       103
       103
       -
         # works.

     

       100
       100
       +
         # Invidious tries to open and validate config/config.yml, even when

     

       101
       101
       +
         # running --help. This specifies a minimal configuration in an

     

       102
       102
       +
         # environment variable. Even though the database and hmac_key are

     

       103
       103
       +
         # bogus, --help still works.

     

       104
       104
        
         installCheckPhase = ''

     

       105
       105
       -
           INVIDIOUS_CONFIG="database_url: sqlite3:///dev/null" $out/bin/invidious --help

     

       105
       105
       +
           INVIDIOUS_CONFIG="$(cat <<EOF

     

       106
       106
       +
           database_url: sqlite3:///dev/null

     

       107
       107
       +
           hmac_key: "this-is-required"

     

       108
       108
       +
           EOF

     

       109
       109
       +
           )" $out/bin/invidious --help

     

       106
       110
        
         '';

     

       107
       111
        
       

     

       108
       112
        
         passthru = {

+1 -1

pkgs/servers/invidious/update.sh

···

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

     

       2
       2
       -
       #!nix-shell -i bash -p curl crystal crystal2nix jq git moreutils nix nix-prefetch pkg-config

     

       2
       2
       +
       #!nix-shell -i bash -p curl crystal crystal2nix jq git moreutils nix nix-prefetch pkg-config pcre

     

       3
       3
        
       git_url='https://github.com/iv-org/invidious.git'

     

       4
       4
        
       git_branch='master'

     

       5
       5
        
       git_dir='/var/tmp/invidious.git'

+3 -3

pkgs/servers/invidious/versions.json

···

       4
       4
        
           "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A="

     

       5
       5
        
         },

     

       6
       6
        
         "invidious": {

     

       7
       7
       -
           "rev": "545a5937d87d31622e87bb2ba8151f8aecd66c81",

     

       8
       8
       -
           "sha256": "sha256-1Ra3nLO2DsnTvyovteF0cOIl07GHbJyPbTYBRIyKuAs=",

     

       9
       9
       -
           "version": "unstable-2023-06-06"

     

       7
       7
       +
           "rev": "34508966027fce3f460d9670eeecef67b92565a0",

     

       8
       8
       +
           "sha256": "sha256-z+6YHhESb0Ws9DRaVH4AR2i/SaWgM9OhTzxdY1bkv/0=",

     

       9
       9
       +
           "version": "unstable-2023-08-07"

     

       10
       10
        
         },

     

       11
       11
        
         "lsquic": {

     

       12
       12
        
           "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=",

+36

pkgs/servers/mail/mailman/0001-Disable-broken-test_help_output-testcase.patch

···

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

     

       2
       2
       +
       From: Maximilian Bosch <maximilian@mbosch.me>

     

       3
       3
       +
       Date: Sat, 12 Aug 2023 12:27:25 +0200

     

       4
       4
       +
       Subject: [PATCH] Disable broken `test_help_output` testcase

     

       5
       5
       +
       

     

       6
       6
       +
       The assertion fails, but checking for the exact whereabouts of helptext

     

       7
       7
       +
       doesn't bring too much value anyways, so it seems OK to just skip the

     

       8
       8
       +
       test.

     

       9
       9
       +
       ---

     

       10
       10
       +
        .../tests/commands/test_attachments_to_file.py      | 13 -------------

     

       11
       11
       +
        1 file changed, 13 deletions(-)

     

       12
       12
       +
       

     

       13
       13
       +
       diff --git a/hyperkitty/tests/commands/test_attachments_to_file.py b/hyperkitty/tests/commands/test_attachments_to_file.py

     

       14
       14
       +
       index b3e61f3a..8db7c4b2 100644

     

       15
       15
       +
       --- a/hyperkitty/tests/commands/test_attachments_to_file.py

     

       16
       16
       +
       +++ b/hyperkitty/tests/commands/test_attachments_to_file.py

     

       17
       17
       +
       @@ -83,16 +83,3 @@ class CommandTestCase(TestCase):

     

       18
       18
       +
                    self.assertEqual(fp.getvalue(), """\

     

       19
       19
       +
        2 attachments moved.

     

       20
       20
       +
        """)

     

       21
       21
       +
       -

     

       22
       22
       +
       -    def test_help_output(self):

     

       23
       23
       +
       -        with io.StringIO() as fp, redirect_stdout(fp):

     

       24
       24
       +
       -            with suppress(SystemExit):

     

       25
       25
       +
       -                call_command('attachments_to_file', '--help')

     

       26
       26
       +
       -

     

       27
       27
       +
       -            output_value = fp.getvalue()

     

       28
       28
       +
       -            assert (

     

       29
       29
       +
       -                "HYPERKITTY_ATTACHMENT_FOLDER" in output_value

     

       30
       30
       +
       -                and "-c CHUNK_SIZE" in output_value

     

       31
       31
       +
       -                and "-c CHUNK_SIZE, --chunk-size CHUNK_SIZE" in output_value

     

       32
       32
       +
       -                and "-v {0,1}, --verbosity {0,1}" in output_value

     

       33
       33
       +
       -            )

     

       34
       34
       +
       -- 

     

       35
       35
       +
       2.40.1

     

       36
       36
       +

+3 -17

pkgs/servers/mail/mailman/hyperkitty.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , python3

     

       3
       3
        
       , fetchPypi

     

       4
       4
       -
       , fetchpatch

     

       5
       4
        
       }:

     

       6
       5
        
       

     

       7
       6
        
       with python3.pkgs;

     

       8
       7
        
       

     

       9
       8
        
       buildPythonPackage rec {

     

       10
       9
        
         pname = "HyperKitty";

     

       11
       11
       -
         # Note: Mailman core must be on the latest version before upgrading HyperKitty.

     

       12
       12
       -
         # See: https://gitlab.com/mailman/postorius/-/issues/516#note_544571309

     

       13
       13
       -
         version = "1.3.5";

     

       10
       10
       +
         version = "1.3.7";

     

       14
       11
        
         disabled = pythonOlder "3.8";

     

       15
       12
        
       

     

       16
       13
        
         src = fetchPypi {

     

       17
       14
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "sha256-gmkiK8pIHfubbbxNdm/D6L2o722FptxYgINYdIUOn4Y=";

     

       15
       15
       +
           sha256 = "sha256-TXSso+wwVGdBymIzns5yOS4pj1EdConmm87b/NyBAss=";

     

       19
       16
        
         };

     

       20
       17
        
       

     

       21
       18
        
         patches = [

     

       22
       22
       -
           # FIXME: backport Python 3.10 support fix, remove for next release

     

       23
       23
       -
           (fetchpatch {

     

       24
       24
       -
             url = "https://gitlab.com/mailman/hyperkitty/-/commit/551a44a76e46931fc5c1bcb341235d8f579820be.patch";

     

       25
       25
       -
             sha256 = "sha256-5XCrvyrDEqH3JryPMoOXSlVVDLQ+PdYBqwGYxkExdvk=";

     

       26
       26
       -
             includes = [ "hyperkitty/*" ];

     

       27
       27
       -
           })

     

       28
       28
       -
       

     

       29
       29
       -
           # Fix for Python >=3.9.13

     

       30
       30
       -
           (fetchpatch {

     

       31
       31
       -
             url = "https://gitlab.com/mailman/hyperkitty/-/commit/3efe7507944dbdbfcfa4c182d332528712476b28.patch";

     

       32
       32
       -
             sha256 = "sha256-yXuhTbmfDiYEXEsnz+zp+xLHRqI4GtkOhGHN+37W0iQ=";

     

       33
       33
       -
           })

     

       19
       19
       +
           ./0001-Disable-broken-test_help_output-testcase.patch

     

       34
       20
        
         ];

     

       35
       21
        
       

     

       36
       22
        
         postPatch = ''

+2 -4

pkgs/servers/mail/mailman/postorius.nix

···

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     

       6
       6
        
         pname = "postorius";

     

       7
       7
       -
         # Note: Mailman core must be on the latest version before upgrading Postorious.

     

       8
       8
       -
         # See: https://gitlab.com/mailman/postorius/-/issues/516#note_544571309

     

       9
       9
       -
         version = "1.3.6";

     

       7
       7
       +
         version = "1.3.8";

     

       10
       8
        
       

     

       11
       9
        
         src = fetchPypi {

     

       12
       10
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "sha256-KwzEU9IfcQ6YPZu3jPuFrd6ux/3e2pzoLfTrak/aGmg=";

     

       11
       11
       +
           sha256 = "sha256-1mSt+PVx3xUJDc5JwrCmKiRNIDwbsjjbM2Fi5Sgz6h8=";

     

       14
       12
        
         };

     

       15
       13
        
       

     

       16
       14
        
         propagatedBuildInputs = [ django-mailman3 readme_renderer ];

+21 -17

pkgs/servers/mail/mailman/python.nix

···

       1
       1
       -
       { python3, fetchPypi }:

     

       1
       1
       +
       { python3, lib, overlay ? (_: _: {}) }:

     

       2
       2
        
       

     

       3
       3
        
       python3.override {

     

       4
       4
       -
         packageOverrides = self: super: {

     

       5
       5
       -
           django = super.django_3;

     

       4
       4
       +
         packageOverrides = lib.composeExtensions

     

       5
       5
       +
           (self: super: {

     

       6
       6
       +
             /*

     

       7
       7
       +
               This overlay can be used whenever we need to override

     

       8
       8
       +
               dependencies specific to the mailman ecosystem: in the past

     

       9
       9
       +
               this was necessary for e.g. psycopg2[1] or sqlalchemy[2].

     

       6
       10
        
       

     

       7
       7
       -
           # does not find tests

     

       8
       8
       -
           alembic = super.alembic.overridePythonAttrs (oldAttrs: {

     

       9
       9
       -
             doCheck = false;

     

       10
       10
       -
           });

     

       11
       11
       -
           # Fixes `AssertionError: database connection isn't set to UTC`

     

       12
       12
       -
           psycopg2 = super.psycopg2.overridePythonAttrs (a: rec {

     

       13
       13
       -
             version = "2.8.6";

     

       14
       14
       -
             src = fetchPypi {

     

       15
       15
       -
               inherit version;

     

       16
       16
       -
               inherit (a) pname;

     

       17
       17
       -
               sha256 = "fb23f6c71107c37fd667cb4ea363ddeb936b348bbd6449278eb92c189699f543";

     

       18
       18
       -
             };

     

       19
       19
       -
           });

     

       20
       20
       -
         };

     

       11
       11
       +
               In such a large ecosystem this sort of issue is expected

     

       12
       12
       +
               to arise again. Since we don't want to clutter the python package-set

     

       13
       13
       +
               itself with version overrides and don't want to change the APIs

     

       14
       14
       +
               in here back and forth every time this comes up (and as a result

     

       15
       15
       +
               force users to change their code accordingly), this overlay

     

       16
       16
       +
               is kept on purpose, even when empty.

     

       17
       17
       +
       

     

       18
       18
       +
               [1] 72a14ea563a3f5bf85db659349a533fe75a8b0ce

     

       19
       19
       +
               [2] f931bc81d63f5cfda55ac73d754c87b3fd63b291

     

       20
       20
       +
             */

     

       21
       21
       +
             django = super.django_3;

     

       22
       22
       +
           })

     

       23
       23
       +
       

     

       24
       24
       +
           overlay;

     

       21
       25
        
       }

+2 -2

pkgs/servers/mail/mailman/web.nix

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "mailman-web";

     

       9
       9
       -
         version = "0.0.5";

     

       9
       9
       +
         version = "0.0.6";

     

       10
       10
        
         disabled = pythonOlder "3.8";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
       -
           sha256 = "sha256-9pvs/VATAsMcGNrj58b/LifysEPTNhrAP57sfp4nX6Q=";

     

       14
       14
       +
           sha256 = "sha256-UWdqrcx529r6kwgf0YEHiDrpZlGoUBR6OdYtHMTPMGY=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         postPatch = ''

+29 -3

pkgs/servers/mail/rspamd/default.nix

···

       1
       1
       -
       { stdenv, lib, fetchFromGitHub, cmake, perl

     

       2
       2
       -
       , glib, luajit, openssl, pcre, pkg-config, sqlite, ragel, icu

     

       3
       3
       -
       , hyperscan, jemalloc, blas, lapack, lua, libsodium

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , fetchpatch2

     

       5
       5
       +
       , cmake

     

       6
       6
       +
       , perl

     

       7
       7
       +
       , glib

     

       8
       8
       +
       , luajit

     

       9
       9
       +
       , openssl

     

       10
       10
       +
       , pcre

     

       11
       11
       +
       , pkg-config

     

       12
       12
       +
       , sqlite

     

       13
       13
       +
       , ragel

     

       14
       14
       +
       , icu

     

       15
       15
       +
       , hyperscan

     

       16
       16
       +
       , jemalloc

     

       17
       17
       +
       , blas

     

       18
       18
       +
       , lapack

     

       19
       19
       +
       , lua

     

       20
       20
       +
       , libsodium

     

       4
       21
        
       , withBlas ? true

     

       5
       22
        
       , withHyperscan ? stdenv.isx86_64

     

       6
       23
        
       , withLuaJIT ? stdenv.isx86_64

     
···

       19
       36
        
           rev = version;

     

       20
       37
        
           hash = "sha256-GuWuJK73RE+cS8451m+bcmpZNQEzmZtexm19xgdDQeU=";

     

       21
       38
        
         };

     

       39
       39
       +
       

     

       40
       40
       +
         patches = [

     

       41
       41
       +
           # Fix leak in `gzip` function

     

       42
       42
       +
           # https://github.com/rspamd/rspamd/issues/4564

     

       43
       43
       +
           (fetchpatch2 {

     

       44
       44
       +
             url = "https://github.com/rspamd/rspamd/commit/ffbab4fbf218514845b8e5209aec044621b1f460.patch";

     

       45
       45
       +
             hash = "sha256-ltkC/mZcYmGoSFILaTTRB/UWSn36flEbuJP4Buys05Y=";

     

       46
       46
       +
           })

     

       47
       47
       +
         ];

     

       22
       48
        
       

     

       23
       49
        
         hardeningEnable = [ "pie" ];

     

       24
       50

+4 -12

pkgs/servers/monitoring/prometheus/redis-exporter.nix

···

       1
       1
       -
       { lib, buildGoModule, fetchFromGitHub, nixosTests, fetchpatch }:

     

       1
       1
       +
       { lib, buildGoModule, fetchFromGitHub, nixosTests }:

     

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "redis_exporter";

     

       5
       5
       -
         version = "1.51.0";

     

       5
       5
       +
         version = "1.52.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "oliver006";

     

       9
       9
        
           repo = "redis_exporter";

     

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

     

       11
       11
       -
           sha256 = "sha256-NvkAwUrygjys25lcTxtRnrex4+XIK2yzqKkk26f4cmE=";

     

       11
       11
       +
           sha256 = "sha256-DVl67+pouQHg26vF5ONntPjQfyxnLusI3LTpT96ogNw=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         patches = [

     

       15
       15
       -
           # https://github.com/oliver006/redis_exporter/pull/812

     

       16
       16
       -
           (fetchpatch {

     

       17
       17
       -
             url = "https://github.com/Ma27/redis_exporter/commit/250b2e9febbadef326ca9ae68c372dfaabd53ca9.patch";

     

       18
       18
       -
             sha256 = "sha256-G1OIUwlFZ06UWudWvc6v1YFcRz05ji1326nUcd9zYDc=";

     

       19
       19
       -
           })

     

       20
       20
       -
         ];

     

       21
       21
       -
       

     

       22
       22
       -
         vendorHash = "sha256-S7cEaFBgyvDmsNq+NvqtC8I2SRL/ngXUuNdx6TN/riI=";

     

       14
       14
       +
         vendorHash = "sha256-nezvUbKZ8yi7Etp/dg3sT2g5bWBFMYZimt31NT91BEo=";

     

       23
       15
        
       

     

       24
       16
        
         ldflags = [

     

       25
       17
        
           "-X main.BuildVersion=${version}"

+3 -3

pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "smartctl_exporter";

     

       9
       9
       -
         version = "0.9.1";

     

       9
       9
       +
         version = "0.10.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "prometheus-community";

     

       13
       13
        
           repo = pname;

     

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

     

       15
       15
       -
           hash = "sha256-fc1NZ5QwzR/jJkeaDm5PMT4wBFFlqZOXKTJMBJWKJJ8=";

     

       15
       15
       +
           hash = "sha256-M4d8l9EbOZsi2ubyRo7KSBYewcC9NidW/Rf1QVVIvo8=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         vendorSha256 = "sha256-lQKuT5dzjDHFpRSmcXpKD1RJDlEv+0kcxENkv3mT4FU=";

     

       18
       18
       +
         vendorHash = "sha256-0WLI+nLhRkf1CGhSer1Jkv1nUho5sxIbTE/Mf5JmX7U=";

     

       19
       19
        
       

     

       20
       20
        
         ldflags = [

     

       21
       21
        
           "-X github.com/prometheus/common/version.Version=${version}"

+21 -18

pkgs/servers/search/opensearch/default.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , stdenv

     

       3
       3
       -
       , stdenvNoCC

     

       1
       1
       +
       { coreutils

     

       4
       2
        
       , fetchurl

     

       5
       5
       -
       , makeWrapper

     

       6
       6
       -
       , jre_headless

     

       7
       3
        
       , gnugrep

     

       8
       8
       -
       , coreutils

     

       9
       9
       -
       , autoPatchelfHook

     

       10
       10
       -
       , zlib

     

       4
       4
       +
       , jre_headless

     

       5
       5
       +
       , lib

     

       6
       6
       +
       , makeBinaryWrapper

     

       11
       7
        
       , nixosTests

     

       8
       8
       +
       , stdenv

     

       9
       9
       +
       , stdenvNoCC

     

       12
       10
        
       }:

     

       13
       11
        
       

     

       14
       14
       -
       stdenvNoCC.mkDerivation rec {

     

       12
       12
       +
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       15
       13
        
         pname = "opensearch";

     

       16
       16
       -
         version = "2.8.0";

     

       14
       14
       +
         version = "2.9.0";

     

       17
       15
        
       

     

       18
       16
        
         src = fetchurl {

     

       19
       19
       -
           url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${version}/opensearch-${version}-linux-x64.tar.gz";

     

       20
       20
       -
           hash = "sha256-64vWis+YQfjOw8eaYi1nggq/Q2ErqqcEuISXPGROypc=";

     

       17
       17
       +
           url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz";

     

       18
       18
       +
           hash = "sha256-A9YjwtmacQDC8PrdyP/ai6J+roqmP/bz99rSM3votow=";

     

       21
       19
        
         };

     

       22
       20
        
       

     

       23
       23
       -
         nativeBuildInputs = [ makeWrapper ];

     

       24
       24
       -
         buildInputs = [ jre_headless ];

     

       21
       21
       +
         nativeBuildInputs = [

     

       22
       22
       +
           makeBinaryWrapper

     

       23
       23
       +
         ];

     

       24
       24
       +
       

     

       25
       25
       +
         buildInputs = [

     

       26
       26
       +
           jre_headless

     

       27
       27
       +
         ];

     

       25
       28
        
       

     

       26
       29
        
         installPhase = ''

     

       27
       30
        
           runHook preInstall

     
···

       48
       51
        
         meta = {

     

       49
       52
        
           description = "Open Source, Distributed, RESTful Search Engine";

     

       50
       53
        
           homepage = "https://github.com/opensearch-project/OpenSearch";

     

       54
       54
       +
           license = lib.licenses.asl20;

     

       55
       55
       +
           maintainers = with lib.maintainers; [ shyim ];

     

       56
       56
       +
           platforms = lib.platforms.unix;

     

       51
       57
        
           sourceProvenance = with lib.sourceTypes; [

     

       52
       58
        
             binaryBytecode

     

       53
       59
        
             binaryNativeCode

     

       54
       60
        
           ];

     

       55
       55
       -
           license = lib.licenses.asl20;

     

       56
       56
       -
           platforms = lib.platforms.unix;

     

       57
       57
       -
           maintainers = with lib.maintainers; [ shyim ];

     

       58
       61
        
         };

     

       59
       59
       -
       }

     

       62
       62
       +
       })

+2 -2

pkgs/servers/sql/postgresql/ext/plr.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "plr";

     

       5
       5
       -
         version = "8.4.5";

     

       5
       5
       +
         version = "8.4.6";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "postgres-plr";

     

       9
       9
        
           repo = "plr";

     

       10
       10
        
           rev = "REL${builtins.replaceStrings ["."] ["_"] version}";

     

       11
       11
       -
           sha256 = "sha256-G/V3I1JI6dWto/hK6lfOTBYEvbmkovvnvk2TwSQq4no=";

     

       11
       11
       +
           sha256 = "sha256-c+wKWL66pulihVQnhdbzivrZOMD1/FfOpb+vFoHgqVg=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ pkg-config ];

+2 -37

pkgs/servers/web-apps/wiki-js/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "wiki-js";

     

       5
       5
       -
         version = "2.5.299";

     

       5
       5
       +
         version = "2.5.300";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz";

     

       9
       9
       -
           sha256 = "sha256-GYe05dbR8RwCzPedeCMUQTWZ51roM/V2jUPPv7o7UEU=";

     

       9
       9
       +
           sha256 = "sha256-Cycq2oeB8v02VtE5KPs09+uzZqvGbJRH+J4YPDYo+yY=";

     

       10
       10
        
         };

     

       11
       11
       -
       

     

       12
       12
       -
         # Implements nodejs 18 support as it's not planned to fix this before

     

       13
       13
       -
         # the release of v3[1] which is planned to happen in 2023, but not before

     

       14
       14
       -
         # NixOS 23.05. However, in the lifespan of 23.05 v16 will get EOLed, so

     

       15
       15
       -
         # we have to hack this on our own.

     

       16
       16
       -
         #

     

       17
       17
       -
         # The problem we fix here is that `exports."/public/"` in a `package.json`

     

       18
       18
       -
         # is prohibited, i.e. you cannot export full directories anymore.

     

       19
       19
       -
         #

     

       20
       20
       -
         # Unfortunately it's non-trivial to fix this because v10 of `extract-files`

     

       21
       21
       -
         # (where the problem is fixed) doesn't work for graphql-tools (which depends

     

       22
       22
       -
         # on this). Updating this as well is also quite complex because in later

     

       23
       23
       -
         # versions the package was split up into multiple smaller packages and

     

       24
       24
       -
         # thus a lot of parts of the code-base would need to be changed accordingly.

     

       25
       25
       -
         #

     

       26
       26
       -
         # Since this is the only breaking change of nodejs 17/18[2][3], this workaround

     

       27
       27
       -
         # will be necessary until we can upgrade to v3.

     

       28
       28
       -
         #

     

       29
       29
       -
         # [1] https://github.com/requarks/wiki/discussions/6388

     

       30
       30
       -
         # [2] https://nodejs.org/en/blog/release/v17.0.0

     

       31
       31
       -
         # [3] https://nodejs.org/en/blog/release/v18.0.0

     

       32
       32
       -
         patches = [ ./drop-node-check.patch ];

     

       33
       33
       -
         nativeBuildInputs = [ jq moreutils ];

     

       34
       34
       -
         postPatch = ''

     

       35
       35
       -
           # Dirty hack to implement nodejs-18 support.

     

       36
       36
       -
           <./node_modules/extract-files/package.json jq '

     

       37
       37
       -
             # error out loud if the structure has changed and we need to change

     

       38
       38
       -
             # this expression

     

       39
       39
       -
             if .exports|has("./public/")|not then

     

       40
       40
       -
               halt_error(1)

     

       41
       41
       -
             else

     

       42
       42
       -
               .exports."./public/*" = "./public/*.js" | del(.exports."./public/")

     

       43
       43
       -
             end

     

       44
       44
       -
           ' | sponge ./node_modules/extract-files/package.json

     

       45
       45
       -
         '';

     

       46
       11
        
       

     

       47
       12
        
         sourceRoot = ".";

     

       48
       13

-19

pkgs/servers/web-apps/wiki-js/drop-node-check.patch

···

       1
       1
       -
       diff --git a/server/index.js b/server/index.js

     

       2
       2
       -
       index 7cdb4f80..161ebeb7 100644

     

       3
       3
       -
       --- a/server/index.js

     

       4
       4
       -
       +++ b/server/index.js

     

       5
       5
       -
       @@ -8,14 +8,6 @@ const { nanoid } = require('nanoid')

     

       6
       6
       -
        const { DateTime } = require('luxon')

     

       7
       7
       -
        const { gte } = require('semver')

     

       8
       8
       -
        

     

       9
       9
       -
       -// ----------------------------------------

     

       10
       10
       -
       -// Check Node.js version

     

       11
       11
       -
       -// ----------------------------------------

     

       12
       12
       -
       -if (gte(process.version, '18.0.0')) {

     

       13
       13
       -
       -  console.error('You\'re using an unsupported Node.js version. Please read the requirements.')

     

       14
       14
       -
       -  process.exit(1)

     

       15
       15
       -
       -}

     

       16
       16
       -
       -

     

       17
       17
       -
        // ----------------------------------------

     

       18
       18
       -
        // Init WIKI instance

     

       19
       19
       -
        // ----------------------------------------

+3 -3

pkgs/tools/backup/duplicati/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "duplicati";

     

       5
       5
       -
         version = "2.0.6.3";

     

       5
       5
       +
         version = "2.0.7.1";

     

       6
       6
        
         channel = "beta";

     

       7
       7
       -
         build_date = "2021-06-17";

     

       7
       7
       +
         build_date = "2023-05-25";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchzip {

     

       10
       10
        
           url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip";

     

       11
       11
       -
           sha256 = "sha256-usMwlmer6rLgP46wGVkaAIocUW4MjuEpVWdX7rRcghg=";

     

       11
       11
       +
           hash = "sha256-isPmRC6N+gEZgvJ0bgeFf5kOQJsicZOsGnT+CAGgg+U=";

     

       12
       12
        
           stripRoot = false;

     

       13
       13
        
         };

     

       14
       14

+2 -2

pkgs/tools/misc/panoply/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenvNoCC.mkDerivation rec {

     

       4
       4
        
         pname = "panoply";

     

       5
       5
       -
         version = "5.2.8";

     

       5
       5
       +
         version = "5.2.9";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz";

     

       9
       9
       -
           sha256 = "sha256-KqlXG49hUHoQPvkDxJ2kJzRn+imMONQT04TP5r6AV6I=";

     

       9
       9
       +
           sha256 = "sha256-InnHiaPvSCCtRmWStyrYQMhNQnoG+lhSBe7ECrPFKFc=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ makeWrapper ];

+3 -3

pkgs/tools/networking/netbird/default.nix

···

       30
       30
        
       in

     

       31
       31
        
       buildGoModule rec {

     

       32
       32
        
         pname = "netbird";

     

       33
       33
       -
         version = "0.22.3";

     

       33
       33
       +
         version = "0.22.4";

     

       34
       34
        
       

     

       35
       35
        
         src = fetchFromGitHub {

     

       36
       36
        
           owner = "netbirdio";

     

       37
       37
        
           repo = pname;

     

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

     

       39
       39
       -
           sha256 = "sha256-1LUHS3G46EnDz0FgAXXOqluGD+fTRaALypZKNgXtCf0=";

     

       39
       39
       +
           sha256 = "sha256-t5uD/1SryxlCA1IPYPTL2nTov+cDzGdprs+J06vpLKI=";

     

       40
       40
        
         };

     

       41
       41
        
       

     

       42
       42
       -
         vendorHash = "sha256-Fj80sYoNXt/rHUC8IEevbNbSIvWHPaKd90UQQTkd/7w=";

     

       42
       42
       +
         vendorHash = "sha256-CwozOBAPFSsa1XzDOHBgmFSwGiNekWT8t7KGR2KOOX4=";

     

       43
       43
        
       

     

       44
       44
        
         nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;

     

       45
       45

+28

pkgs/tools/security/dumpasn1/configpath.patch

···

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

     

       2
       2
       +
       From: Paul Meyer <49727155+katexochen@users.noreply.github.com>

     

       3
       3
       +
       Date: Sun, 13 Aug 2023 14:13:21 +0200

     

       4
       4
       +
       Subject: [PATCH] make config path injectable during build

     

       5
       5
       +
       

     

       6
       6
       +
       This way a config path can be added to the list during build by

     

       7
       7
       +
       defining the makro.

     

       8
       8
       +
       

     

       9
       9
       +
       Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>

     

       10
       10
       +
       ---

     

       11
       11
       +
        dumpasn1.c | 4 ++++

     

       12
       12
       +
        1 file changed, 4 insertions(+)

     

       13
       13
       +
       

     

       14
       14
       +
       diff --git a/dumpasn1.c b/dumpasn1.c

     

       15
       15
       +
       index e7bf268..94f1582 100644

     

       16
       16
       +
       --- a/dumpasn1.c

     

       17
       17
       +
       +++ b/dumpasn1.c

     

       18
       18
       +
       @@ -451,6 +451,10 @@ static const char *configPaths[] = {

     

       19
       19
       +
        	/* General environment-based paths */

     

       20
       20
       +
        	"$DUMPASN1_PATH/",

     

       21
       21
       +
        

     

       22
       22
       +
       +  #ifdef DUMPASN1_CONFIG_PATH

     

       23
       23
       +
       +	DUMPASN1_CONFIG_PATH,

     

       24
       24
       +
       +  #endif /* DUMPASN1_CONFIG_PATH */

     

       25
       25
       +
       +

     

       26
       26
       +
        	NULL

     

       27
       27
       +
        	};

     

       28
       28
       +
        #endif /* OS-specific search paths */

+34

pkgs/tools/security/dumpasn1/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       }:

     

       5
       5
       +
       stdenv.mkDerivation (finalAttrs: {

     

       6
       6
       +
         pname = "dumpasn1";

     

       7
       7
       +
         version = "20230207.0.0";

     

       8
       8
       +
       

     

       9
       9
       +
         src = fetchFromGitHub {

     

       10
       10
       +
           owner = "katexochen";

     

       11
       11
       +
           repo = "dumpasn1";

     

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

     

       13
       13
       +
           hash = "sha256-r40czSLdjCYbt73zK7exCoP/kMq6+pyJfz9LKJLLaXM=";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         CFLAGS = ''-DDUMPASN1_CONFIG_PATH='"$(out)/etc/"' '';

     

       17
       17
       +
       

     

       18
       18
       +
         makeFlags = [ "prefix=$(out)" ];

     

       19
       19
       +
       

     

       20
       20
       +
         patches = [

     

       21
       21
       +
           # Allow adding a config file path during build via makro.

     

       22
       22
       +
           # Used to add the store path of the included config file through CFLAGS.

     

       23
       23
       +
           # This won't be merged upstream.

     

       24
       24
       +
           ./configpath.patch

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         meta = with lib; {

     

       28
       28
       +
           description = "Display and debug ASN.1 data";

     

       29
       29
       +
           homepage = "https://github.com/katexochen/dumpasn1";

     

       30
       30
       +
           license = licenses.bsd2;

     

       31
       31
       +
           maintainers = with maintainers; [ katexochen ];

     

       32
       32
       +
           platforms = platforms.linux ++ platforms.darwin;

     

       33
       33
       +
         };

     

       34
       34
       +
       })

+1

pkgs/tools/security/pynitrokey/default.nix

···

       46
       46
        
         ];

     

       47
       47
        
       

     

       48
       48
        
         pythonRelaxDeps = [

     

       49
       49
       +
           "click"

     

       49
       50
        
           "cryptography"

     

       50
       51
        
           "protobuf"

     

       51
       52
        
           "python-dateutil"

+2 -2

pkgs/tools/security/trufflehog/default.nix

···

       7
       7
        
       

     

       8
       8
        
       buildGoModule rec {

     

       9
       9
        
         pname = "trufflehog";

     

       10
       10
       -
         version = "3.47.0";

     

       10
       10
       +
         version = "3.48.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "trufflesecurity";

     

       14
       14
        
           repo = "trufflehog";

     

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

     

       16
       16
       -
           hash = "sha256-qdVWq+YESSHAmylyOWLygchy1VBxHDOmgk9CxSl22es=";

     

       16
       16
       +
           hash = "sha256-mt4ht9bRV6yh5aunX/zelqttNGvPvhIrX0rN7nEpS2g=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         vendorHash = "sha256-AlyONwUP4Z8S8Qj3hbGFCyhUlYzlN6AIxGzrnQaXBLY=";

+13 -7

pkgs/tools/system/gptman/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, testers, gptman }:

     

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "gptman";

     

       5
       5
       -
         version = "0.8.3";

     

       5
       5
       +
         version = "1.0.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
       -
           owner = "cecton";

     

       8
       8
       +
           owner = "rust-disk-partition-management";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-hI3F1E1vdbNDEeJ4FrU0EvR0t64svzUIpI6zaf0CquM=";

     

       11
       11
       +
           hash = "sha256-sDRnvF/XPXgWIIIrOmnEuktP8XvZxPahF2n4h8RCX+o=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-3PRGPZGymccRo9dtQZgMMEL29x+GiUkTzgc8uAB/ocQ=";

     

       14
       14
       +
         cargoHash = "sha256-voslPSh7n31cGTKaayKXomgiXWVTutuc4FxfnZUDejc=";

     

       15
       15
        
       

     

       16
       16
        
         buildInputs = lib.optional stdenv.isDarwin libiconv;

     

       17
       17
        
       

     

       18
       18
       +
         buildFeatures = [ "cli" ];

     

       19
       19
       +
       

     

       20
       20
       +
         passthru.tests.version = testers.testVersion {

     

       21
       21
       +
           package = gptman;

     

       22
       22
       +
         };

     

       23
       23
       +
       

     

       18
       24
        
         meta = with lib; {

     

       19
       19
       -
           description = "A CLI tool for Linux to copy a partition from one disk to another and more.";

     

       20
       20
       -
           homepage = "https://github.com/cecton/gptman";

     

       25
       25
       +
           description = "A GPT manager that allows you to copy partitions from one disk to another and more";

     

       26
       26
       +
           homepage = "https://github.com/rust-disk-partition-management/gptman";

     

       21
       27
        
           license = with licenses; [ asl20 /* or */ mit ];

     

       22
       28
        
           maintainers = with maintainers; [ akshgpt7 ];

     

       23
       29
        
         };

+3 -2

pkgs/tools/wayland/wl-mirror/default.nix

···

       28
       28
        
       

     

       29
       29
        
       stdenv.mkDerivation rec {

     

       30
       30
        
         pname = "wl-mirror";

     

       31
       31
       -
         version = "0.13.1";

     

       31
       31
       +
         version = "0.13.2";

     

       32
       32
        
       

     

       33
       33
        
         src = fetchFromGitHub {

     

       34
       34
        
           owner = "Ferdi265";

     

       35
       35
        
           repo = "wl-mirror";

     

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

     

       37
       37
       -
           hash = "sha256-qYJmcsID5qbUs27ZCU2HkWVVnBmxWmyzSgruLPB4jI8=";

     

       37
       37
       +
           hash = "sha256-dmdRe4GZ1W2gD7ZF1MudBqfZIm9HyBjISa+xB54BLz4=";

     

       38
       38
        
         };

     

       39
       39
        
       

     

       40
       40
        
         strictDeps = true;

     

       41
       41
       +
         depsBuildBuild = [ pkg-config ];

     

       41
       42
        
         nativeBuildInputs = [ cmake pkg-config wayland-scanner scdoc makeWrapper ];

     

       42
       43
        
         buildInputs = [ libGL wayland wayland-protocols wlr-protocols bash ];

     

       43
       44

+8

pkgs/top-level/all-packages.nix

···

       7464
       7464
        
           inherit (darwin.apple_sdk.frameworks) Security;

     

       7465
       7465
        
         };

     

       7466
       7466
        
       

     

       7467
       7467
       +
         dumpasn1 = callPackage ../tools/security/dumpasn1 { };

     

       7468
       7468
       +
       

     

       7467
       7469
        
         dumptorrent = callPackage ../tools/misc/dumptorrent { };

     

       7468
       7470
        
       

     

       7469
       7471
        
         duo-unix = callPackage ../tools/security/duo-unix { };

     
···

       20342
       20344
        
       

     

       20343
       20345
        
         zon2nix = callPackage ../tools/nix/zon2nix { };

     

       20344
       20346
        
       

     

       20347
       20347
       +
         ztags = callPackage ../development/tools/misc/ztags { };

     

       20348
       20348
       +
       

     

       20345
       20349
        
         ### DEVELOPMENT / LIBRARIES

     

       20346
       20350
        
       

     

       20347
       20351
        
         a52dec = callPackage ../development/libraries/a52dec { };

     
···

       32025
       32029
        
       

     

       32026
       32030
        
         svox = callPackage ../applications/audio/svox { };

     

       32027
       32031
        
       

     

       32032
       32032
       +
         g4music = callPackage ../applications/audio/g4music { };

     

       32033
       32033
       +
       

     

       32028
       32034
        
         genesys = callPackage ../applications/misc/genesys { };

     

       32029
       32035
        
       

     

       32030
       32036
        
         giada = callPackage ../applications/audio/giada { };

     
···

       33033
       33039
        
         kubectl-gadget = callPackage ../applications/networking/cluster/kubectl-gadget { };

     

       33034
       33040
        
       

     

       33035
       33041
        
         kubectl-images = callPackage ../applications/networking/cluster/kubectl-images { };

     

       33042
       33042
       +
       

     

       33043
       33043
       +
         kubectl-klock = callPackage ../applications/networking/cluster/kubectl-klock { };

     

       33036
       33044
        
       

     

       33037
       33045
        
         kubectl-ktop = callPackage ../applications/networking/cluster/kubectl-ktop { };

     

       33038
       33046

-1

pkgs/top-level/linux-kernels.nix

···

       442
       442
        
           rtl8821cu = callPackage ../os-specific/linux/rtl8821cu { };

     

       443
       443
        
       

     

       444
       444
        
           rtw88 = callPackage ../os-specific/linux/rtw88 { };

     

       445
       445
       -
           rtlwifi_new = rtw88;

     

       446
       445
        
       

     

       447
       446
        
           rtw89 = if lib.versionOlder kernel.version "5.16" then callPackage ../os-specific/linux/rtw89 { } else null;

     

       448
       447

+2

pkgs/top-level/python-packages.nix

···

       1211
       1211
        
       

     

       1212
       1212
        
         backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which { };

     

       1213
       1213
        
       

     

       1214
       1214
       +
         backports-strenum = callPackage ../development/python-modules/backports-strenum { };

     

       1215
       1215
       +
       

     

       1214
       1216
        
         backports-zoneinfo = callPackage ../development/python-modules/backports-zoneinfo { };

     

       1215
       1217
        
       

     

       1216
       1218
        
         bacpypes = callPackage ../development/python-modules/bacpypes { };