commit 2ad7b248e6cc9bad847dcefaa48397072e19eccf · pyrox.dev/nixpkgs

+1 -1

doc/languages-frameworks/python.section.md

···

       1513
       1513
        
           python = super.python.override {

     

       1514
       1514
        
             packageOverrides = python-self: python-super: {

     

       1515
       1515
        
               twisted = python-super.twisted.overrideAttrs (oldAttrs: {

     

       1516
       1516
       -
                 src = super.fetchPipy {

     

       1516
       1516
       +
                 src = super.fetchPypi {

     

       1517
       1517
        
                   pname = "twisted";

     

       1518
       1518
        
                   version = "19.10.0";

     

       1519
       1519
        
                   sha256 = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d";

+6

maintainers/maintainer-list.nix

···

       4287
       4287
        
           githubId = 731722;

     

       4288
       4288
        
           name = "Ryan Scheel";

     

       4289
       4289
        
         };

     

       4290
       4290
       +
         hawkw = {

     

       4291
       4291
       +
           email = "eliza@elizas.website";

     

       4292
       4292
       +
           github = "hawkw";

     

       4293
       4293
       +
           githubId = 2796466;

     

       4294
       4294
       +
           name = "Eliza Weisman";

     

       4295
       4295
       +
         };

     

       4290
       4296
        
         hax404 = {

     

       4291
       4297
        
           email = "hax404foogit@hax404.de";

     

       4292
       4298
        
           github = "hax404";

+9 -96

nixos/lib/testing-python.nix

···

       257
       257
        
               inherit test driver driverInteractive nodes;

     

       258
       258
        
             };

     

       259
       259
        
       

     

       260
       260
       -
         runInMachine =

     

       261
       261
       -
           { drv

     

       262
       262
       -
           , machine

     

       263
       263
       -
           , preBuild ? ""

     

       264
       264
       -
           , postBuild ? ""

     

       265
       265
       -
           , qemu_pkg ? pkgs.qemu_test

     

       266
       266
       -
           , ... # ???

     

       267
       267
       -
           }:

     

       268
       268
       -
           let

     

       269
       269
       -
             build-vms = import ./build-vms.nix {

     

       270
       270
       -
               inherit system pkgs minimal specialArgs extraConfigurations;

     

       271
       271
       -
             };

     

       272
       260
        
       

     

       273
       273
       -
             vm = build-vms.buildVM { }

     

       274
       274
       -
               [

     

       275
       275
       -
                 machine

     

       276
       276
       -
                 {

     

       277
       277
       -
                   key = "run-in-machine";

     

       278
       278
       -
                   networking.hostName = "client";

     

       279
       279
       -
                   nix.readOnlyStore = false;

     

       280
       280
       -
                   virtualisation.writableStore = false;

     

       281
       281
       -
                 }

     

       282
       282
       -
               ];

     

       261
       261
       +
         abortForFunction = functionName: abort ''The ${functionName} function was

     

       262
       262
       +
           removed because it is not an essential part of the NixOS testing

     

       263
       263
       +
           infrastructure. It had no usage in NixOS or Nixpkgs and it had no designated

     

       264
       264
       +
           maintainer. You are free to reintroduce it by documenting it in the manual

     

       265
       265
       +
           and adding yourself as maintainer. It was removed in

     

       266
       266
       +
           https://github.com/NixOS/nixpkgs/pull/137013

     

       267
       267
       +
         '';

     

       283
       268
        
       

     

       284
       284
       -
             buildrunner = writeText "vm-build" ''

     

       285
       285
       -
               source $1

     

       286
       286
       -
       

     

       287
       287
       -
               ${coreutils}/bin/mkdir -p $TMPDIR

     

       288
       288
       -
               cd $TMPDIR

     

       289
       289
       -
       

     

       290
       290
       -
               exec $origBuilder $origArgs

     

       291
       291
       -
             '';

     

       292
       292
       -
       

     

       293
       293
       -
             testScript = ''

     

       294
       294
       -
               start_all()

     

       295
       295
       -
               client.wait_for_unit("multi-user.target")

     

       296
       296
       -
               ${preBuild}

     

       297
       297
       -
               client.succeed("env -i ${bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2")

     

       298
       298
       -
               ${postBuild}

     

       299
       299
       -
               client.succeed("sync") # flush all data before pulling the plug

     

       300
       300
       -
             '';

     

       269
       269
       +
         runInMachine = abortForFunction "runInMachine";

     

       301
       270
        
       

     

       302
       302
       -
             testDriver = pythonTestDriver { inherit qemu_pkg; };

     

       303
       303
       -
       

     

       304
       304
       -
             vmRunCommand = writeText "vm-run" ''

     

       305
       305
       -
               xchg=vm-state-client/xchg

     

       306
       306
       -
               ${coreutils}/bin/mkdir $out

     

       307
       307
       -
               ${coreutils}/bin/mkdir -p $xchg

     

       308
       308
       -
       

     

       309
       309
       -
               for i in $passAsFile; do

     

       310
       310
       -
                 i2=''${i}Path

     

       311
       311
       -
                 _basename=$(${coreutils}/bin/basename ''${!i2})

     

       312
       312
       -
                 ${coreutils}/bin/cp ''${!i2} $xchg/$_basename

     

       313
       313
       -
                 eval $i2=/tmp/xchg/$_basename

     

       314
       314
       -
                 ${coreutils}/bin/ls -la $xchg

     

       315
       315
       -
               done

     

       316
       316
       -
       

     

       317
       317
       -
               unset i i2 _basename

     

       318
       318
       -
               export | ${gnugrep}/bin/grep -v '^xchg=' > $xchg/saved-env

     

       319
       319
       -
               unset xchg

     

       320
       320
       -
       

     

       321
       321
       -
               export tests='${testScript}'

     

       322
       322
       -
               ${testDriver}/bin/nixos-test-driver --keep-vm-state ${vm.config.system.build.vm}/bin/run-*-vm

     

       323
       323
       -
             ''; # */

     

       324
       324
       -
       

     

       325
       325
       -
           in

     

       326
       326
       -
           lib.overrideDerivation drv (attrs: {

     

       327
       327
       -
             requiredSystemFeatures = [ "kvm" ];

     

       328
       328
       -
             builder = "${bash}/bin/sh";

     

       329
       329
       -
             args = [ "-e" vmRunCommand ];

     

       330
       330
       -
             origArgs = attrs.args;

     

       331
       331
       -
             origBuilder = attrs.builder;

     

       332
       332
       -
           });

     

       333
       333
       -
       

     

       334
       334
       -
       

     

       335
       335
       -
         runInMachineWithX = { require ? [ ], ... } @ args:

     

       336
       336
       -
           let

     

       337
       337
       -
             client =

     

       338
       338
       -
               { ... }:

     

       339
       339
       -
               {

     

       340
       340
       -
                 inherit require;

     

       341
       341
       -
                 imports = [

     

       342
       342
       -
                   ../tests/common/auto.nix

     

       343
       343
       -
                 ];

     

       344
       344
       -
                 virtualisation.memorySize = 1024;

     

       345
       345
       -
                 services.xserver.enable = true;

     

       346
       346
       -
                 test-support.displayManager.auto.enable = true;

     

       347
       347
       -
                 services.xserver.displayManager.defaultSession = "none+icewm";

     

       348
       348
       -
                 services.xserver.windowManager.icewm.enable = true;

     

       349
       349
       -
               };

     

       350
       350
       -
           in

     

       351
       351
       -
           runInMachine ({

     

       352
       352
       -
             machine = client;

     

       353
       353
       -
             preBuild =

     

       354
       354
       -
               ''

     

       355
       355
       -
                 client.wait_for_x()

     

       356
       356
       -
               '';

     

       357
       357
       -
           } // args);

     

       358
       358
       -
       

     

       271
       271
       +
         runInMachineWithX = abortForFunction "runInMachineWithX";

     

       359
       272
        
       

     

       360
       273
        
         simpleTest = as: (makeTest as).test;

     

       361
       274

+1 -1

nixos/modules/misc/ids.nix

···

       201
       201
        
             peerflix = 163;

     

       202
       202
        
             #chronos = 164; # removed 2020-08-15

     

       203
       203
        
             gitlab = 165;

     

       204
       204
       -
             tox-bootstrapd = 166;

     

       204
       204
       +
             # tox-bootstrapd = 166; removed 2021-09-15

     

       205
       205
        
             cadvisor = 167;

     

       206
       206
        
             nylon = 168;

     

       207
       207
        
             #apache-kafka = 169;# dynamically allocated as of 2021-09-03

+12

nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json

···

       52
       52
        
             "name": "JBL LIVE650BTNC"

     

       53
       53
        
           },

     

       54
       54
        
           {

     

       55
       55
       +
             "name": "Motorola DC800",

     

       56
       56
       +
             "no-features": [

     

       57
       57
       +
               "sbc-xq"

     

       58
       58
       +
             ]

     

       59
       59
       +
           },

     

       60
       60
       +
           {

     

       61
       61
       +
             "name": "Motorola S305",

     

       62
       62
       +
             "no-features": [

     

       63
       63
       +
               "sbc-xq"

     

       64
       64
       +
             ]

     

       65
       65
       +
           },

     

       66
       66
       +
           {

     

       55
       67
        
             "name": "Soundcore Life P2-L",

     

       56
       68
        
             "no-features": [

     

       57
       69
        
               "msbc-alt1",

+8 -13

nixos/modules/services/networking/tox-bootstrapd.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
         home = "/var/lib/tox-bootstrapd";

     

       7
       7
       -
         PIDFile = "${home}/pid";

     

       6
       6
       +
         WorkingDirectory = "/var/lib/tox-bootstrapd";

     

       7
       7
       +
         PIDFile = "${WorkingDirectory}/pid";

     

       8
       8
        
       

     

       9
       9
        
         pkg = pkgs.libtoxcore;

     

       10
       10
        
         cfg = config.services.toxBootstrapd;

     

       11
       11
        
         cfgFile = builtins.toFile "tox-bootstrapd.conf"

     

       12
       12
        
           ''

     

       13
       13
        
             port = ${toString cfg.port}

     

       14
       14
       -
             keys_file_path = "${home}/keys"

     

       14
       14
       +
             keys_file_path = "${WorkingDirectory}/keys"

     

       15
       15
        
             pid_file_path = "${PIDFile}"

     

       16
       16
        
             ${cfg.extraConfig}

     

       17
       17
        
           '';

     
···

       36
       36
        
       

     

       37
       37
        
                 keysFile = mkOption {

     

       38
       38
        
                   type = types.str;

     

       39
       39
       -
                   default = "${home}/keys";

     

       39
       39
       +
                   default = "${WorkingDirectory}/keys";

     

       40
       40
        
                   description = "Node key file.";

     

       41
       41
        
                 };

     

       42
       42
        
       

     
···

       56
       56
        
       

     

       57
       57
        
         config = mkIf config.services.toxBootstrapd.enable {

     

       58
       58
        
       

     

       59
       59
       -
           users.users.tox-bootstrapd =

     

       60
       60
       -
             { uid = config.ids.uids.tox-bootstrapd;

     

       61
       61
       -
               description = "Tox bootstrap daemon user";

     

       62
       62
       -
               inherit home;

     

       63
       63
       -
               createHome = true;

     

       64
       64
       -
             };

     

       65
       65
       -
       

     

       66
       59
        
           systemd.services.tox-bootstrapd = {

     

       67
       60
        
             description = "Tox DHT bootstrap daemon";

     

       68
       61
        
             after = [ "network.target" ];

     
···

       70
       63
        
             serviceConfig =

     

       71
       64
        
               { ExecStart = "${pkg}/bin/tox-bootstrapd --config=${cfgFile}";

     

       72
       65
        
                 Type = "forking";

     

       73
       73
       -
                 inherit PIDFile;

     

       74
       74
       -
                 User = "tox-bootstrapd";

     

       66
       66
       +
                 inherit PIDFile WorkingDirectory;

     

       67
       67
       +
                 AmbientCapabilities = ["CAP_NET_BIND_SERVICE"];

     

       68
       68
       +
                 DynamicUser = true;

     

       69
       69
       +
                 StateDirectory = "tox-bootstrapd";

     

       75
       70
        
               };

     

       76
       71
        
           };

     

       77
       72

-1

nixos/tests/all-tests.nix

···

       386
       386
        
         rspamd = handleTest ./rspamd.nix {};

     

       387
       387
        
         rss2email = handleTest ./rss2email.nix {};

     

       388
       388
        
         rsyslogd = handleTest ./rsyslogd.nix {};

     

       389
       389
       -
         runInMachine = handleTest ./run-in-machine.nix {};

     

       390
       389
        
         rxe = handleTest ./rxe.nix {};

     

       391
       390
        
         samba = handleTest ./samba.nix {};

     

       392
       391
        
         samba-wsdd = handleTest ./samba-wsdd.nix {};

-23

nixos/tests/run-in-machine.nix

···

       1
       1
       -
       { system ? builtins.currentSystem,

     

       2
       2
       -
         config ? {},

     

       3
       3
       -
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       -
       }:

     

       5
       5
       -
       

     

       6
       6
       -
       with import ../lib/testing-python.nix { inherit system pkgs; };

     

       7
       7
       -
       

     

       8
       8
       -
       let

     

       9
       9
       -
         output = runInMachine {

     

       10
       10
       -
           drv = pkgs.hello;

     

       11
       11
       -
           machine = { ... }: { /* services.sshd.enable = true; */ };

     

       12
       12
       -
         };

     

       13
       13
       -
       

     

       14
       14
       -
         test = pkgs.runCommand "verify-output" { inherit output; } ''

     

       15
       15
       -
           if [ ! -e "$output/bin/hello" ]; then

     

       16
       16
       -
             echo "Derivation built using runInMachine produced incorrect output:" >&2

     

       17
       17
       -
             ls -laR "$output" >&2

     

       18
       18
       -
             exit 1

     

       19
       19
       -
           fi

     

       20
       20
       -
           "$output/bin/hello" > "$out"

     

       21
       21
       -
         '';

     

       22
       22
       -
       

     

       23
       23
       -
       in test // { inherit test; } # To emulate behaviour of makeTest

+2 -2

pkgs/applications/audio/qmidinet/default.nix

···

       1
       1
        
       { mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, alsa-lib, libjack2 }:

     

       2
       2
        
       

     

       3
       3
        
       mkDerivation rec {

     

       4
       4
       -
         version = "0.9.1";

     

       4
       4
       +
         version = "0.9.4";

     

       5
       5
        
         pname = "qmidinet";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "sha256-cDgF5hbjy5DzGn4Rlmb76XzRa2wURVwPu2rQRKENxQU=";

     

       9
       9
       +
           sha256 = "sha256-7Ui4kUgYgpPVAaaINrd6WGZoYon5UuHszGVaHafb/p0=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         hardeningDisable = [ "format" ];

+3 -3

pkgs/applications/audio/spotify/default.nix

···

       10
       10
        
         # If an update breaks things, one of those might have valuable info:

     

       11
       11
        
         # https://aur.archlinux.org/packages/spotify/

     

       12
       12
        
         # https://community.spotify.com/t5/Desktop-Linux

     

       13
       13
       -
         version = "1.1.67.586.gbb5ef64e";

     

       13
       13
       +
         version = "1.1.68.628.geb44bd66";

     

       14
       14
        
         # To get the latest stable revision:

     

       15
       15
        
         # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'

     

       16
       16
        
         # To get general information:

     

       17
       17
        
         # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'

     

       18
       18
        
         # More examples of api usage:

     

       19
       19
        
         # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py

     

       20
       20
       -
         rev = "50";

     

       20
       20
       +
         rev = "52";

     

       21
       21
        
       

     

       22
       22
        
         deps = [

     

       23
       23
        
           alsa-lib

     
···

       80
       80
        
         # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334

     

       81
       81
        
         src = fetchurl {

     

       82
       82
        
           url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";

     

       83
       83
       -
           sha512 = "f29aa4a3f3d6a72f108f350905789f12ab3ae50cf4f4828f021d3be7759b192506c9a397e45309a5ee659578b6e85de80d7d78f994af9ab631c9fb2dc527c242";

     

       83
       83
       +
           sha512 = "be6f1cb650924eb9e244497374d1dfe6136d28056dbecc7000a03341a4bb4c6ab2c83ec6c707bd6f57afde95262230eafbde08e9c7a7dfcacdf660eb10499f3a";

     

       84
       84
        
         };

     

       85
       85
        
       

     

       86
       86
        
         nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ];

+1 -1

pkgs/applications/editors/emacs/elisp-packages/agda-input/default.nix

···

       1
       1
        
       { trivialBuild

     

       2
       2
        
       , haskellPackages

     

       3
       3
       -
       }

     

       3
       3
       +
       }:

     

       4
       4
        
       

     

       5
       5
        
       trivialBuild {

     

       6
       6
        
         pname = "agda-input";

+2 -2

pkgs/applications/editors/sigil/default.nix

···

       6
       6
        
       

     

       7
       7
        
       mkDerivation rec {

     

       8
       8
        
         pname = "sigil";

     

       9
       9
       -
         version = "1.5.1";

     

       9
       9
       +
         version = "1.7.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           repo = "Sigil";

     

       13
       13
        
           owner = "Sigil-Ebook";

     

       14
       14
        
           rev = version;

     

       15
       15
       -
           sha256 = "sha256-BqNaIsUJE0KmFcmTjJERbclzaRe1dMjareWxUye2se0=";

     

       15
       15
       +
           sha256 = "sha256-a1gstR7qHbzQ3GZ0g/lxUxcHeZ5QgJIvhCV37tqlVfA=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         pythonPath = with python3Packages; [ lxml ];

+1 -1

pkgs/applications/editors/vscode/vscodium.nix

···

       13
       13
        
         archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";

     

       14
       14
        
       

     

       15
       15
        
         sha256 = {

     

       16
       16
       -
           x86_64-linux = "1lzw3svnaf11g8g50w3plymy16rbb71lcag46y1q3xdh62jbq8nc";

     

       16
       16
       +
           x86_64-linux = "03z6wpzbvf046sl1mjvvcshy5czvr4bq2f3ajlr8bj39y9df93h9";

     

       17
       17
        
           x86_64-darwin = "0cs5ikf5dxkg9qkyaq75h0rypil80sk6zmbb0s63191gj6l569yl";

     

       18
       18
        
           aarch64-linux = "05ivgn72v05yy3a9qly4qx0qpyjd2r3ygdw978zc8z09694g5x3i";

     

       19
       19
        
           armv7l-linux = "044izh9ap5s50k796zjcfk0p997b7sfryshp4gaxh3yf5qs0w7l9";

+2 -2

pkgs/applications/misc/anytype/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         pname = "anytype";

     

       5
       5
       -
         version = "0.18.68";

     

       5
       5
       +
         version = "0.19.0";

     

       6
       6
        
         name = "Anytype-${version}";

     

       7
       7
        
         nameExecutable = pname;

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage";

     

       10
       10
        
           name = "Anytype-${version}.AppImage";

     

       11
       11
       -
           sha256 = "sha256-VZYFMUgflc3LEk/nN7eoQbinGQS1AnPHmb8WgKzhGRM=";

     

       11
       11
       +
           sha256 = "sha256-sqCq9/QFygFcOUNCCBReD+eEk/8gvhMsuVD3g/ZPAFg=";

     

       12
       12
        
         };

     

       13
       13
        
         appimageContents = appimageTools.extractType2 { inherit name src; };

     

       14
       14
        
       in

+2 -2

pkgs/applications/misc/qdirstat/default.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         pname = "qdirstat";

     

       7
       7
       -
         version = "1.7.1";

     

       7
       7
       +
         version = "1.8";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "shundhammer";

     

       11
       11
        
           repo = pname;

     

       12
       12
        
           rev = version;

     

       13
       13
       -
           sha256 = "sha256-i1xHMwSnBULJbOA/ykQK9WBd+6TBNBRI9hnU1FDGQlY=";

     

       13
       13
       +
           sha256 = "sha256-R/eUqv5AxO5TcLkqOvlAXEkjAzeKGihf8YIQIIevOR0=";

     

       14
       14
        
         };

     

       15
       15
        
       in

     

       16
       16

+2 -2

pkgs/applications/misc/ticker/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "ticker";

     

       8
       8
       -
         version = "4.2.1";

     

       8
       8
       +
         version = "4.3.0";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "achannarasappa";

     

       12
       12
        
           repo = pname;

     

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

     

       14
       14
       -
           sha256 = "sha256-T9pApuzATohiOUmWa+GBlLrlTNgKNMwtW6fSPO/NS6Y=";

     

       14
       14
       +
           sha256 = "sha256-DdUXT8xrKd114U+CSwIgl7XczxQZGWVZA3tMU7461xY=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         vendorSha256 = "sha256-vTB1RPg1LN44bkWrdGEXR6WRlM/Q2EITUO0yt5ar/zg=";

+3 -3

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

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "fluxctl";

     

       5
       5
       -
         version = "1.24.0";

     

       5
       5
       +
         version = "1.24.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "weaveworks";

     

       9
       9
        
           repo = "flux";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-YjZ73Qc1lXosHopW+ZsrIyv16YupgB6ZpdcSGaZuafQ=";

     

       11
       11
       +
           sha256 = "sha256-lgcEkOu4iaLg+tP826Qpgmn0ogOpr62o1iWlv1yLbBQ=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-OlM0HXFLTLYOZuVCud3k8K5X89zdZVlNkhXZzh0eKXc=";

     

       14
       14
       +
         vendorSha256 = "sha256-NQonBTHToGPo7QsChvuVM/jbV5FK71HMJfe5fe1gZYw=";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ installShellFiles ];

     

       17
       17

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "helmsman";

     

       5
       5
       -
         version = "3.7.2";

     

       5
       5
       +
         version = "3.7.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "Praqma";

     

       9
       9
        
           repo = "helmsman";

     

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

     

       11
       11
       -
           sha256 = "sha256-wzmn06nUycNaQ4tUEBd4q17M1CVC0+5X13rqF7zaHqU=";

     

       11
       11
       +
           sha256 = "sha256-7WN4YjhPbsFZfoFuZzsN85a+kdEVlEzQ9CfWh4nxxTs=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-XHgdVFGIzbPPYgv/T4TtvDDbKAe3niev4S5tu/nwSqg=";

+2 -2

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

···

       12
       12
        
       

     

       13
       13
        
       stdenv.mkDerivation rec {

     

       14
       14
        
         pname = "whatsapp-for-linux";

     

       15
       15
       -
         version = "1.2.0";

     

       15
       15
       +
         version = "1.2.1";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "eneshecan";

     

       19
       19
        
           repo = pname;

     

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

     

       21
       21
       -
           sha256 = "sha256-dB+NsoUEYM3cT0cg5ZOkBGW7ozRGFWSsYQMja3CjaHM=";

     

       21
       21
       +
           sha256 = "sha256-dEJRufOqlY+DnJdUaG5WP9hR1qO7KxR6MjKWq1SJB8A=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [

+17 -10

pkgs/applications/science/chemistry/quantum-espresso/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl

     

       2
       2
       -
       , gfortran, fftw, blas, lapack

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitLab

     

       4
       4
       +
       , gfortran

     

       5
       5
       +
       , fftw

     

       6
       6
       +
       , blas

     

       7
       7
       +
       , lapack

     

       3
       8
        
       , useMpi ? false

     

       4
       9
        
       , mpi

     

       5
       10
        
       }:

     
···

       8
       13
        
         version = "6.6";

     

       9
       14
        
         pname = "quantum-espresso";

     

       10
       15
        
       

     

       11
       11
       -
         src = fetchurl {

     

       12
       12
       -
           url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz";

     

       13
       13
       -
           sha256 = "0b3718bwdqfyssyz25jknijar79qh5cf1bbizv9faliz135mcilj";

     

       16
       16
       +
         src = fetchFromGitLab {

     

       17
       17
       +
           owner = "QEF";

     

       18
       18
       +
           repo = "q-e";

     

       19
       19
       +
           rev = "qe-${version}";

     

       20
       20
       +
           sha256 = "1mkfmw0fq1dabplzdn6v1abhw0ds55gzlvbx3a9brv493whk21yp";

     

       14
       21
        
         };

     

       15
       22
        
       

     

       16
       23
        
         passthru = {

     
···

       33
       40
        
         meta = with lib; {

     

       34
       41
        
           description = "Electronic-structure calculations and materials modeling at the nanoscale";

     

       35
       42
        
           longDescription = ''

     

       36
       36
       -
               Quantum ESPRESSO is an integrated suite of Open-Source computer codes for

     

       37
       37
       -
               electronic-structure calculations and materials modeling at the

     

       38
       38
       -
               nanoscale. It is based on density-functional theory, plane waves, and

     

       39
       39
       -
               pseudopotentials.

     

       40
       40
       -
             '';

     

       43
       43
       +
             Quantum ESPRESSO is an integrated suite of Open-Source computer codes for

     

       44
       44
       +
             electronic-structure calculations and materials modeling at the

     

       45
       45
       +
             nanoscale. It is based on density-functional theory, plane waves, and

     

       46
       46
       +
             pseudopotentials.

     

       47
       47
       +
           '';

     

       41
       48
        
           homepage = "https://www.quantum-espresso.org/";

     

       42
       49
        
           license = licenses.gpl2;

     

       43
       50
        
           platforms = [ "x86_64-linux" "x86_64-darwin" ];

+24

pkgs/development/interpreters/lunatic/default.nix

···

       1
       1
       +
       { cmake, fetchFromGitHub, lib, rustPlatform }:

     

       2
       2
       +
       

     

       3
       3
       +
       rustPlatform.buildRustPackage rec {

     

       4
       4
       +
         pname = "lunatic";

     

       5
       5
       +
         version = "0.6.2";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "lunatic-solutions";

     

       9
       9
       +
           repo = pname;

     

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

     

       11
       11
       +
           sha256 = "1dz8v19jw9v55p3mz4932v6z24ihp6wk238n4d4lx9xj91mf3g6r";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         cargoSha256 = "1rkxl27l6ydmcq3flc6qbnd7zmpkfmyc86b8q4pi7dwhqnd5g70g";

     

       15
       15
       +
       

     

       16
       16
       +
         nativeBuildInputs = [ cmake ];

     

       17
       17
       +
       

     

       18
       18
       +
         meta = with lib; {

     

       19
       19
       +
           description = "An Erlang inspired runtime for WebAssembly";

     

       20
       20
       +
           homepage = "https://lunatic.solutions";

     

       21
       21
       +
           license = with licenses; [ mit /* or */ asl20 ];

     

       22
       22
       +
           maintainers = with maintainers; [ figsoda ];

     

       23
       23
       +
         };

     

       24
       24
       +
       }

+10 -2

pkgs/development/libraries/apr/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, autoreconfHook }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, fetchpatch, autoreconfHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "apr";

     
···

       9
       9
        
           sha256 = "1spp6r2a3xcl5yajm9safhzyilsdzgagc2dadif8x6z9nbq4iqg2";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         patches = lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];

     

       12
       12
       +
         patches = [

     

       13
       13
       +
           (fetchpatch {

     

       14
       14
       +
             name = "CVE-2021-35940.patch";

     

       15
       15
       +
             url = "https://dist.apache.org/repos/dist/release/apr/patches/apr-1.7.0-CVE-2021-35940.patch";

     

       16
       16
       +
             sha256 = "1qd511dyqa1b7bj89iihrlbaavbzl6yyblqginghmcnhw8adymbs";

     

       17
       17
       +
             # convince fetchpatch to restore missing `a/`, `b/` to paths

     

       18
       18
       +
             extraPrefix = "";

     

       19
       19
       +
           })

     

       20
       20
       +
         ] ++ lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];

     

       13
       21
        
       

     

       14
       22
        
         # This test needs the net

     

       15
       23
        
         postPatch = ''

+41

pkgs/development/libraries/bash/bash-preexec/default.nix

···

       1
       1
       +
       { stdenvNoCC, lib, fetchFromGitHub, bats }:

     

       2
       2
       +
       

     

       3
       3
       +
       let version = "0.4.1";

     

       4
       4
       +
       in stdenvNoCC.mkDerivation {

     

       5
       5
       +
         pname = "bash-preexec";

     

       6
       6
       +
         inherit version;

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchFromGitHub {

     

       9
       9
       +
           owner = "rcaloras";

     

       10
       10
       +
           repo = "bash-preexec";

     

       11
       11
       +
           rev = version;

     

       12
       12
       +
           sha256 = "062iigps285628p710i7vh7kmgra5gahq9qiwj7rxir167lg0ggw";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         checkInputs = [ bats ];

     

       16
       16
       +
       

     

       17
       17
       +
         dontConfigure = true;

     

       18
       18
       +
         doCheck = true;

     

       19
       19
       +
         dontBuild = true;

     

       20
       20
       +
       

     

       21
       21
       +
         patchPhase = ''

     

       22
       22
       +
           # Needed since the tests expect that HISTCONTROL is set.

     

       23
       23
       +
           sed -i '/setup()/a HISTCONTROL=""' test/bash-preexec.bats

     

       24
       24
       +
         '';

     

       25
       25
       +
       

     

       26
       26
       +
         checkPhase = ''

     

       27
       27
       +
           bats test

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         installPhase = ''

     

       31
       31
       +
           install -Dm755 $src/bash-preexec.sh $out/share/bash/bash-preexec.sh

     

       32
       32
       +
         '';

     

       33
       33
       +
       

     

       34
       34
       +
         meta = with lib; {

     

       35
       35
       +
           description = "preexec and precmd functions for Bash just like Zsh";

     

       36
       36
       +
           license = licenses.mit;

     

       37
       37
       +
           homepage = "https://github.com/rcaloras/bash-preexec";

     

       38
       38
       +
           maintainers = [ maintainers.hawkw maintainers.rycee ];

     

       39
       39
       +
           platforms = platforms.unix;

     

       40
       40
       +
         };

     

       41
       41
       +
       }

+9 -4

pkgs/development/libraries/opencv/3.x.nix

···

       1
       1
        
       { lib, stdenv

     

       2
       2
       -
       , fetchFromGitHub, fetchpatch

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
        
       , cmake, pkg-config, unzip, zlib, pcre, hdf5

     

       4
       4
        
       , glog, boost, gflags, protobuf

     

       5
       5
        
       , config

     
···

       39
       39
        
       assert enablePython -> pythonPackages != null;

     

       40
       40
        
       

     

       41
       41
        
       let

     

       42
       42
       -
         version = "3.4.8";

     

       42
       42
       +
         version = "3.4.15";

     

       43
       43
        
       

     

       44
       44
        
         src = fetchFromGitHub {

     

       45
       45
        
           owner  = "opencv";

     

       46
       46
        
           repo   = "opencv";

     

       47
       47
        
           rev    = version;

     

       48
       48
       -
           sha256 = "1dnz3gfj70lm1gbrk8pz28apinlqi2x6nvd6xcy5hs08505nqnjp";

     

       48
       48
       +
           hash   = "sha256-dLwQM2VhVlBV4xazS2rItTscKYeeNlNT0G8G1A1mOmc=";

     

       49
       49
        
         };

     

       50
       50
        
       

     

       51
       51
        
         contribSrc = fetchFromGitHub {

     

       52
       52
        
           owner  = "opencv";

     

       53
       53
        
           repo   = "opencv_contrib";

     

       54
       54
        
           rev    = version;

     

       55
       55
       -
           sha256 = "0psaa1yx36n34l09zd1y8jxgf8q4jzxd3vn06fqmzwzy85hcqn8i";

     

       55
       55
       +
           hash   = "sha256-FJDRMmSOT5jA+n2Ke0gEH7n5rgGvB1UzYpYZ1vmucjg=";

     

       56
       56
        
         };

     

       57
       57
        
       

     

       58
       58
        
         # Contrib must be built in order to enable Tesseract support:

     
···

       150
       150
        
         postUnpack = lib.optionalString buildContrib ''

     

       151
       151
        
           cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"

     

       152
       152
        
         '';

     

       153
       153
       +
       

     

       154
       154
       +
         # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV.

     

       155
       155
       +
         patches = [

     

       156
       156
       +
           ./cmake-don-t-use-OpenCVFindOpenEXR.patch

     

       157
       157
       +
         ];

     

       153
       158
        
       

     

       154
       159
        
         # This prevents cmake from using libraries in impure paths (which

     

       155
       160
        
         # causes build failure on non NixOS)

+4 -2

pkgs/development/libraries/opencv/4.x.nix

···

       214
       214
        
           cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib"

     

       215
       215
        
         '';

     

       216
       216
        
       

     

       217
       217
       -
         # This prevents cmake from using libraries in impure paths (which

     

       218
       218
       -
         # causes build failure on non NixOS)

     

       217
       217
       +
         # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV.

     

       219
       218
        
         patches = [

     

       220
       219
        
           ./cmake-don-t-use-OpenCVFindOpenEXR.patch

     

       221
       220
        
         ] ++ lib.optional enableCuda ./cuda_opt_flow.patch;

     

       221
       221
       +
       

     

       222
       222
       +
         # This prevents cmake from using libraries in impure paths (which

     

       223
       223
       +
         # causes build failure on non NixOS)

     

       222
       224
        
         postPatch = ''

     

       223
       225
        
           sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt

     

       224
       226
        
         '';

+2 -2

pkgs/development/libraries/pipewire/default.nix

···

       58
       58
        
       

     

       59
       59
        
         self = stdenv.mkDerivation rec {

     

       60
       60
        
           pname = "pipewire";

     

       61
       61
       -
           version = "0.3.35";

     

       61
       61
       +
           version = "0.3.36";

     

       62
       62
        
       

     

       63
       63
        
           outputs = [

     

       64
       64
        
             "out"

     
···

       77
       77
        
             owner = "pipewire";

     

       78
       78
        
             repo = "pipewire";

     

       79
       79
        
             rev = version;

     

       80
       80
       -
             sha256 = "sha256-cGH0Hd4c4KLyynMb3LIwElwHD99apNiI40SwZC3KG/s=";

     

       80
       80
       +
             sha256 = "sha256-kwoffB0Hi84T4Q0NaxLxsCyPV4R0LayX9kHmXU/vRPA=";

     

       81
       81
        
           };

     

       82
       82
        
       

     

       83
       83
        
           patches = [

+2 -2

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

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "ailment";

     

       10
       10
       -
         version = "9.0.9792";

     

       10
       10
       +
         version = "9.0.9947";

     

       11
       11
        
         disabled = pythonOlder "3.6";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "angr";

     

       15
       15
        
           repo = pname;

     

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

     

       17
       17
       -
           sha256 = "sha256-c+E3ypmN69IyE0HagefrYN8bdCY7amRxa/PGoIX4/cQ=";

     

       17
       17
       +
           sha256 = "sha256-4QwpIZbS+ZPjKp2oKSOzpjCK3Bi5AdntKTO8Ujx2TPE=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         propagatedBuildInputs = [ pyvex ];

+2 -2

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

···

       43
       43
        
       

     

       44
       44
        
       buildPythonPackage rec {

     

       45
       45
        
         pname = "angr";

     

       46
       46
       -
         version = "9.0.9792";

     

       46
       46
       +
         version = "9.0.9947";

     

       47
       47
        
         disabled = pythonOlder "3.6";

     

       48
       48
        
       

     

       49
       49
        
         src = fetchFromGitHub {

     

       50
       50
        
           owner = pname;

     

       51
       51
        
           repo = pname;

     

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

     

       53
       53
       -
           sha256 = "sha256-zDy3dwhCNBtCAwflF/grdNsRllNUHJHMx1PQThHjcnw=";

     

       53
       53
       +
           sha256 = "sha256-qE2LIfcKwMAbmEXycPYo4T1WU9A6tr6mDYcxDs21ySI=";

     

       54
       54
        
         };

     

       55
       55
        
       

     

       56
       56
        
         propagatedBuildInputs = [

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "angrop";

     

       12
       12
       -
         version = "9.0.9792";

     

       12
       12
       +
         version = "9.0.9947";

     

       13
       13
        
         disabled = pythonOlder "3.6";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "angr";

     

       17
       17
        
           repo = pname;

     

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

     

       19
       19
       -
           sha256 = "sha256-rXhXzqjefsKvfsFky4XJd+RaF5z/TRWDg6+IYFIfP2w=";

     

       19
       19
       +
           sha256 = "sha256-f9T2M2ilT8v6G87sbJ1r192zEpBeuWUpgQP9sYsUoeU=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

+2 -2

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

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "archinfo";

     

       10
       10
       -
         version = "9.0.9792";

     

       10
       10
       +
         version = "9.0.9947";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "angr";

     

       14
       14
        
           repo = pname;

     

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

     

       16
       16
       -
           sha256 = "sha256-st4h/ck7hxIx2cZ241C4hEFJvFsTqHmawAB4zsfQ/oU=";

     

       16
       16
       +
           sha256 = "sha256-DffiOMJUxreoWyPxelEL7mzaekwInYLquTS7HBIUJiM=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         checkInputs = [

+2 -2

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

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "censys";

     

       18
       18
       -
         version = "2.0.6";

     

       18
       18
       +
         version = "2.0.7";

     

       19
       19
        
         format = "pyproject";

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.6";

     
···

       24
       24
        
           owner = "censys";

     

       25
       25
        
           repo = "censys-python";

     

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

     

       27
       27
       -
           sha256 = "sha256-Lbd2Pm79n0cFoGHC2rucxgZijzcVYVJJsq1yzqB9QLk=";

     

       27
       27
       +
           sha256 = "0s9y9956awl26rnrp5l78rbrjcwliqdijnmm7k6xm4hh7iak4q6z";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         nativeBuildInputs = [

+2 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "claripy";

     

       16
       16
       -
         version = "9.0.9792";

     

       16
       16
       +
         version = "9.0.9947";

     

       17
       17
        
         disabled = pythonOlder "3.6";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "angr";

     

       21
       21
        
           repo = pname;

     

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

     

       23
       23
       -
           sha256 = "sha256-9jwD75leV02N5B7RaLF2DbC6GjhoDQMmkfFIO9MJ4Es=";

     

       23
       23
       +
           sha256 = "sha256-3nG173x0N4enGTN52wd0HbHbJJrAI7IKSp7FHQ/v/5U=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         # Use upstream z3 implementation

+2 -2

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

···

       15
       15
        
       

     

       16
       16
        
       let

     

       17
       17
        
         # The binaries are following the argr projects release cycle

     

       18
       18
       -
         version = "9.0.9792";

     

       18
       18
       +
         version = "9.0.9947";

     

       19
       19
        
       

     

       20
       20
        
         # Binary files from https://github.com/angr/binaries (only used for testing and only here)

     

       21
       21
        
         binaries = fetchFromGitHub {

     
···

       35
       35
        
           owner = "angr";

     

       36
       36
        
           repo = pname;

     

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

     

       38
       38
       -
           sha256 = "sha256-lCRZj0/L/XNcnJNiLxPY2mCFZowV6hLEpHOEiCsyQ/0=";

     

       38
       38
       +
           sha256 = "sha256-xlzc5Bde/OFlGJe9e4qb7QSszWyINJkQfEzY0wTaKD0=";

     

       39
       39
        
         };

     

       40
       40
        
       

     

       41
       41
        
         propagatedBuildInputs = [

-1

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

···

       3
       3
        
       , python

     

       4
       4
        
       , pythonOlder

     

       5
       5
        
       , fetchFromGitLab

     

       6
       6
       -
       , fetchpatch

     

       7
       6
        
       , substituteAll

     

       8
       7
        
       , bubblewrap

     

       9
       8
        
       , exiftool

+127 -100

pkgs/development/python-modules/pysdl2/PySDL2-dll.patch

···

       1
       1
       -
       diff -ru PySDL2-0.9.7-old/sdl2/dll.py PySDL2-0.9.7/sdl2/dll.py

     

       2
       2
       -
       --- PySDL2-0.9.7-old/sdl2/dll.py	2020-02-15 09:36:29.000000000 +0100

     

       3
       3
       -
       +++ PySDL2-0.9.7/sdl2/dll.py	2020-09-23 20:24:09.365497270 +0200

     

       4
       4
       -
       @@ -94,15 +94,16 @@

     

       5
       5
       -
            """Function wrapper around the different DLL functions. Do not use or

     

       6
       6
       -
            instantiate this one directly from your user code.

     

       7
       7
       -
            """

     

       8
       8
       -
       -    def __init__(self, libinfo, libnames, path=None):

     

       9
       9
       -
       +    def __init__(self, libinfo, libfile):

     

       10
       10
       -
                self._dll = None

     

       11
       11
       -
                self._libname = libinfo

     

       12
       12
       -
                self._version = None

     

       13
       13
       -
       -        foundlibs = _findlib(libnames, path)

     

       14
       14
       -
       -        dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset")

     

       15
       15
       -
       -        if len(foundlibs) == 0:

     

       16
       16
       -
       -            raise RuntimeError("could not find any library for %s (%s)" %

     

       17
       17
       -
       -                               (libinfo, dllmsg))

     

       18
       18
       -
       +        #foundlibs = _findlib(libnames, path)

     

       19
       19
       -
       +        #dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset")

     

       20
       20
       -
       +        #if len(foundlibs) == 0:

     

       21
       21
       -
       +        #    raise RuntimeError("could not find any library for %s (%s)" %

     

       22
       22
       -
       +        #                       (libinfo, dllmsg))

     

       23
       23
       -
       +        foundlibs = [ libfile ]

     

       24
       24
       -
                for libfile in foundlibs:

     

       25
       25
       -
                    try:

     

       26
       26
       -
                        self._dll = CDLL(libfile)

     

       27
       27
       -
       @@ -117,9 +118,9 @@

     

       28
       28
       -
                if self._dll is None:

     

       29
       29
       -
                    raise RuntimeError("found %s, but it's not usable for the library %s" %

     

       30
       30
       -
                                       (foundlibs, libinfo))

     

       31
       31
       -
       -        if path is not None and sys.platform in ("win32",) and \

     

       32
       32
       -
       -            path in self._libfile:

     

       33
       33
       -
       -            os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"])

     

       34
       34
       -
       +        #if path is not None and sys.platform in ("win32",) and \

     

       35
       35
       -
       +        #    path in self._libfile:

     

       36
       36
       -
       +        #    os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"])

     

       37
       37
       -
        

     

       38
       38
       -
            def bind_function(self, funcname, args=None, returns=None, added=None):

     

       39
       39
       -
                """Binds the passed argument and return value types to the specified

     

       40
       40
       -
       @@ -220,7 +221,7 @@

     

       41
       41
       -
            return

     

       42
       42
       -
        

     

       43
       43
       -
        try:

     

       44
       44
       -
       -    dll = DLL("SDL2", ["SDL2", "SDL2-2.0"], os.getenv("PYSDL2_DLL_PATH"))

     

       45
       45
       -
       +    dll = DLL("SDL2", "@sdl2@")

     

       46
       46
       -
        except RuntimeError as exc:

     

       47
       47
       -
            raise ImportError(exc)

     

       48
       48
       -
        

     

       49
       49
       -
       diff -ru PySDL2-0.9.7-old/sdl2/sdlgfx.py PySDL2-0.9.7/sdl2/sdlgfx.py

     

       50
       50
       -
       --- PySDL2-0.9.7-old/sdl2/sdlgfx.py	2020-02-02 11:07:00.000000000 +0100

     

       51
       51
       -
       +++ PySDL2-0.9.7/sdl2/sdlgfx.py	2020-09-23 20:23:56.997419129 +0200

     

       52
       52
       -
       @@ -39,8 +39,7 @@

     

       53
       53
       -
                   ]

     

       54
       54
       -
        

     

       55
       55
       -
        try:

     

       56
       56
       -
       -    dll = DLL("SDL2_gfx", ["SDL2_gfx", "SDL2_gfx-1.0"],

     

       57
       57
       -
       -              os.getenv("PYSDL2_DLL_PATH"))

     

       58
       58
       -
       +    dll = DLL("SDL2_gfx", "@sdl2_gfx@")

     

       59
       59
       -
        except RuntimeError as exc:

     

       60
       60
       -
            raise ImportError(exc)

     

       61
       61
       -
        

     

       62
       62
       -
       diff -ru PySDL2-0.9.7-old/sdl2/sdlimage.py PySDL2-0.9.7/sdl2/sdlimage.py

     

       63
       63
       -
       --- PySDL2-0.9.7-old/sdl2/sdlimage.py	2020-02-02 11:07:00.000000000 +0100

     

       64
       64
       -
       +++ PySDL2-0.9.7/sdl2/sdlimage.py	2020-09-23 20:23:50.085375658 +0200

     

       65
       65
       -
       @@ -27,8 +27,7 @@

     

       66
       66
       -
                   ]

     

       67
       67
       -
        

     

       68
       68
       -
        try:

     

       69
       69
       -
       -    dll = DLL("SDL2_image", ["SDL2_image", "SDL2_image-2.0"],

     

       70
       70
       -
       -              os.getenv("PYSDL2_DLL_PATH"))

     

       71
       71
       -
       +    dll = DLL("SDL2_image", "@sdl2_image@")

     

       72
       72
       -
        except RuntimeError as exc:

     

       73
       73
       -
            raise ImportError(exc)

     

       74
       74
       -
        

     

       75
       75
       -
       diff -ru PySDL2-0.9.7-old/sdl2/sdlmixer.py PySDL2-0.9.7/sdl2/sdlmixer.py

     

       76
       76
       -
       --- PySDL2-0.9.7-old/sdl2/sdlmixer.py	2020-02-02 11:07:00.000000000 +0100

     

       77
       77
       -
       +++ PySDL2-0.9.7/sdl2/sdlmixer.py	2020-09-23 20:23:46.117350771 +0200

     

       78
       78
       -
       @@ -53,8 +53,7 @@

     

       79
       79
       -
                  ]

     

       80
       80
       -
        

     

       81
       81
       -
        try:

     

       82
       82
       -
       -    dll = DLL("SDL2_mixer", ["SDL2_mixer", "SDL2_mixer-2.0"],

     

       83
       83
       -
       -              os.getenv("PYSDL2_DLL_PATH"))

     

       84
       84
       -
       +    dll = DLL("SDL2_mixer", "@sdl2_mixer@")

     

       85
       85
       -
        except RuntimeError as exc:

     

       86
       86
       -
            raise ImportError(exc)

     

       87
       87
       -
        

     

       88
       88
       -
       diff -ru PySDL2-0.9.7-old/sdl2/sdlttf.py PySDL2-0.9.7/sdl2/sdlttf.py

     

       89
       89
       -
       --- PySDL2-0.9.7-old/sdl2/sdlttf.py	2020-02-02 11:07:00.000000000 +0100

     

       90
       90
       -
       +++ PySDL2-0.9.7/sdl2/sdlttf.py	2020-09-23 20:23:40.069312931 +0200

     

       91
       91
       -
       @@ -39,8 +39,7 @@

     

       92
       92
       -
                  ]

     

       93
       93
       -
        

     

       94
       94
       -
        try:

     

       95
       95
       -
       -    dll = DLL("SDL2_ttf", ["SDL2_ttf", "SDL2_ttf-2.0"],

     

       96
       96
       -
       -              os.getenv("PYSDL2_DLL_PATH"))

     

       97
       97
       -
       +    dll = DLL("SDL2_ttf", "@sdl2_ttf@")

     

       98
       98
       -
        except RuntimeError as exc:

     

       99
       99
       -
            raise ImportError(exc)

     

       100
       100
       -
        

     

       1
       1
       +
       diff --git a/sdl2/dll.py b/sdl2/dll.py

     

       2
       2
       +
       index 6e30259..12e1f7d 100644

     

       3
       3
       +
       --- a/sdl2/dll.py

     

       4
       4
       +
       +++ b/sdl2/dll.py

     

       5
       5
       +
       @@ -145,7 +145,7 @@ class DLL(object):

     

       6
       6
       +
            """Function wrapper around the different DLL functions. Do not use or

     

       7
       7
       +
            instantiate this one directly from your user code.

     

       8
       8
       +
            """

     

       9
       9
       +
       -    def __init__(self, libinfo, libnames, path=None):

     

       10
       10
       +
       +    def __init__(self, libinfo, libfile):

     

       11
       11
       +
                self._dll = None

     

       12
       12
       +
                self._deps = None

     

       13
       13
       +
                self._libname = libinfo

     

       14
       14
       +
       @@ -157,11 +157,12 @@ class DLL(object):

     

       15
       15
       +
                    "SDL2_image": 2001,

     

       16
       16
       +
                    "SDL2_gfx": 1003

     

       17
       17
       +
                }

     

       18
       18
       +
       -        foundlibs = _findlib(libnames, path)

     

       19
       19
       +
       -        dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset")

     

       20
       20
       +
       -        if len(foundlibs) == 0:

     

       21
       21
       +
       -            raise RuntimeError("could not find any library for %s (%s)" %

     

       22
       22
       +
       -                               (libinfo, dllmsg))

     

       23
       23
       +
       +        #foundlibs = _findlib(libnames, path)

     

       24
       24
       +
       +        #dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset")

     

       25
       25
       +
       +        #if len(foundlibs) == 0:

     

       26
       26
       +
       +        #    raise RuntimeError("could not find any library for %s (%s)" %

     

       27
       27
       +
       +        #                       (libinfo, dllmsg))

     

       28
       28
       +
       +        foundlibs = [ libfile ]

     

       29
       29
       +
                for libfile in foundlibs:

     

       30
       30
       +
                    try:

     

       31
       31
       +
                        self._dll = CDLL(libfile)

     

       32
       32
       +
       @@ -185,19 +186,19 @@ class DLL(object):

     

       33
       33
       +
                                       (foundlibs, libinfo))

     

       34
       34
       +
                if _using_ms_store_python():

     

       35
       35
       +
                    self._deps = _preload_deps(libinfo, self._libfile)

     

       36
       36
       +
       -        if path is not None and sys.platform in ("win32",) and \

     

       37
       37
       +
       -            path in self._libfile:

     

       38
       38
       +
       -            os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"])

     

       39
       39
       +
       +        #if path is not None and sys.platform in ("win32",) and \

     

       40
       40
       +
       +        #    path in self._libfile:

     

       41
       41
       +
       +        #    os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"])

     

       42
       42
       +
        

     

       43
       43
       +
            def bind_function(self, funcname, args=None, returns=None, added=None):

     

       44
       44
       +
                """Binds the passed argument and return value types to the specified

     

       45
       45
       +
                function. If the version of the loaded library is older than the

     

       46
       46
       +
                version where the function was added, an informative exception will

     

       47
       47
       +
                be raised if the bound function is called.

     

       48
       48
       +
                

     

       49
       49
       +
                Args:

     

       50
       50
       +
                    funcname (str): The name of the function to bind.

     

       51
       51
       +
                    args (List or None, optional): The data types of the C function's 

     

       52
       52
       +
                        arguments. Should be 'None' if function takes no arguments.

     

       53
       53
       +
                    returns (optional): The return type of the bound C function. Should

     

       54
       54
       +
                        be 'None' if function returns 'void'.

     

       55
       55
       +
       @@ -288,7 +289,7 @@ def nullfunc(*args):

     

       56
       56
       +
            return

     

       57
       57
       +
        

     

       58
       58
       +
        try:

     

       59
       59
       +
       -    dll = DLL("SDL2", ["SDL2", "SDL2-2.0", "SDL2-2.0.0"], os.getenv("PYSDL2_DLL_PATH"))

     

       60
       60
       +
       +    dll = DLL("SDL2", "@sdl2@")

     

       61
       61
       +
        except RuntimeError as exc:

     

       62
       62
       +
            raise ImportError(exc)

     

       63
       63
       +
        

     

       64
       64
       +
       diff --git a/sdl2/sdlgfx.py b/sdl2/sdlgfx.py

     

       65
       65
       +
       index 090752e..a8a7488 100644

     

       66
       66
       +
       --- a/sdl2/sdlgfx.py

     

       67
       67
       +
       +++ b/sdl2/sdlgfx.py

     

       68
       68
       +
       @@ -50,8 +50,7 @@ __all__ = [

     

       69
       69
       +
        

     

       70
       70
       +
        

     

       71
       71
       +
        try:

     

       72
       72
       +
       -    dll = DLL("SDL2_gfx", ["SDL2_gfx", "SDL2_gfx-1.0"],

     

       73
       73
       +
       -              os.getenv("PYSDL2_DLL_PATH"))

     

       74
       74
       +
       +    dll = DLL("SDL2_gfx", "@sdl2_gfx@")

     

       75
       75
       +
        except RuntimeError as exc:

     

       76
       76
       +
            raise ImportError(exc)

     

       77
       77
       +
        

     

       78
       78
       +
       diff --git a/sdl2/sdlimage.py b/sdl2/sdlimage.py

     

       79
       79
       +
       index a6884e8..95d96df 100644

     

       80
       80
       +
       --- a/sdl2/sdlimage.py

     

       81
       81
       +
       +++ b/sdl2/sdlimage.py

     

       82
       82
       +
       @@ -32,15 +32,14 @@ __all__ = [

     

       83
       83
       +
            "IMG_LoadXCF_RW", "IMG_LoadWEBP_RW", "IMG_LoadXPM_RW",

     

       84
       84
       +
            "IMG_LoadXV_RW", "IMG_ReadXPMFromArray",

     

       85
       85
       +
            "IMG_GetError", "IMG_SetError", "IMG_SaveJPG", "IMG_SaveJPG_RW",

     

       86
       86
       +
       -    

     

       87
       87
       +
       +

     

       88
       88
       +
            # Python Functions

     

       89
       89
       +
            "get_dll_file"

     

       90
       90
       +
        ]

     

       91
       91
       +
        

     

       92
       92
       +
        

     

       93
       93
       +
        try:

     

       94
       94
       +
       -    dll = DLL("SDL2_image", ["SDL2_image", "SDL2_image-2.0"],

     

       95
       95
       +
       -              os.getenv("PYSDL2_DLL_PATH"))

     

       96
       96
       +
       +    dll = DLL("SDL2_image", "@sdl2_image@")

     

       97
       97
       +
        except RuntimeError as exc:

     

       98
       98
       +
            raise ImportError(exc)

     

       99
       99
       +
        

     

       100
       100
       +
       diff --git a/sdl2/sdlmixer.py b/sdl2/sdlmixer.py

     

       101
       101
       +
       index 9ad9b85..1c36289 100644

     

       102
       102
       +
       --- a/sdl2/sdlmixer.py

     

       103
       103
       +
       +++ b/sdl2/sdlmixer.py

     

       104
       104
       +
       @@ -76,8 +76,7 @@ __all__ = [

     

       105
       105
       +
        ]

     

       106
       106
       +
        

     

       107
       107
       +
        try:

     

       108
       108
       +
       -    dll = DLL("SDL2_mixer", ["SDL2_mixer", "SDL2_mixer-2.0"],

     

       109
       109
       +
       -              os.getenv("PYSDL2_DLL_PATH"))

     

       110
       110
       +
       +    dll = DLL("SDL2_mixer", "@sdl2_mixer@")

     

       111
       111
       +
        except RuntimeError as exc:

     

       112
       112
       +
            raise ImportError(exc)

     

       113
       113
       +
        

     

       114
       114
       +
       diff --git a/sdl2/sdlttf.py b/sdl2/sdlttf.py

     

       115
       115
       +
       index 9c2d951..bd5a16a 100644

     

       116
       116
       +
       --- a/sdl2/sdlttf.py

     

       117
       117
       +
       +++ b/sdl2/sdlttf.py

     

       118
       118
       +
       @@ -54,8 +54,7 @@ __all__ = [

     

       119
       119
       +
        

     

       120
       120
       +
        

     

       121
       121
       +
        try:

     

       122
       122
       +
       -    dll = DLL("SDL2_ttf", ["SDL2_ttf", "SDL2_ttf-2.0"],

     

       123
       123
       +
       -              os.getenv("PYSDL2_DLL_PATH"))

     

       124
       124
       +
       +    dll = DLL("SDL2_ttf", "@sdl2_ttf@")

     

       125
       125
       +
        except RuntimeError as exc:

     

       126
       126
       +
            raise ImportError(exc)

     

       127
       127
       +

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "pyvex";

     

       14
       14
       -
         version = "9.0.9792";

     

       14
       14
       +
         version = "9.0.9947";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "sha256-8AF7dCvQvBDjITRwi40KqMXcgiJpmKcK16ys1ybFIyk=";

     

       18
       18
       +
           sha256 = "sha256-52yI8V2rQTDbo/giHqhTKJ5Pz0PAMEz6ErZuo7RlbbM=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         postPatch = lib.optionalString stdenv.isDarwin ''

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "userpath";

     

       9
       9
       -
         version = "1.6.0";

     

       9
       9
       +
         version = "1.7.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256="1xpgdmdvhmmmdlivsqlzx1xvyj0gcnfp0j2ba5izmv3q2k5abfdj";

     

       13
       13
       +
           sha256="sha256-3NZsX6mxo8EjYvMJu7W8eZK6yK+G0XtOaxpLFmoRxD8=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         propagatedBuildInputs = [ click ];

+4 -4

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

···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
        
         pname = "bloop";

     

       13
       13
       -
         version = "1.4.8";

     

       13
       13
       +
         version = "1.4.9";

     

       14
       14
        
       

     

       15
       15
        
         bloop-coursier-channel = fetchurl {

     

       16
       16
        
           url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json";

     

       17
       17
       -
           sha256 = "1hfd5gc98bp4p4m85jva2mlkh10q10n9s5136z8620mmjq93rx70";

     

       17
       17
       +
           sha256 = "0yh9k98c0cq9ksi3g6rb1q1qblnhcznrc5z1y9ps8cvwv2lx8ly4";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         bloop-bash = fetchurl {

     
···

       54
       54
        
       

     

       55
       55
        
           outputHashMode = "recursive";

     

       56
       56
        
           outputHashAlgo = "sha256";

     

       57
       57
       -
           outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1cs3ng6bj9s7xf6c4xaiqgg5qr34abnipfgc44sy2ljklr7x0jwa"

     

       58
       58
       -
             else if stdenv.isDarwin && stdenv.isx86_64 then "0l9vqvzcmxya1s04cps96skw4dslh3i3ks73dl53ing50zb0ga9r"

     

       57
       57
       +
           outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1hxyzf430g95l6qz1qlq8wvizvy6j3a7a9crb3lcxd67cpbg3x7i"

     

       58
       58
       +
             else if stdenv.isDarwin && stdenv.isx86_64 then "0x5yqf3i8y6s5h27yr0jkpvj6ch25ckx2802dmaxlgq6gz0fx6w2"

     

       59
       59
        
             else throw "unsupported platform";

     

       60
       60
        
         };

     

       61
       61

+3 -3

pkgs/development/tools/build-managers/sbt-extras/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "sbt-extras";

     

       6
       6
       -
         rev = "d77c348e3f2fdfbd90b51ce0e5894405bb08687c";

     

       7
       7
       -
         version = "2021-08-04";

     

       6
       6
       +
         rev = "bd4c3e80a0a07c78407422de13039ce5889fb4b0";

     

       7
       7
       +
         version = "2021-09-15";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "paulp";

     

       11
       11
        
           repo = "sbt-extras";

     

       12
       12
        
           inherit rev;

     

       13
       13
       -
           sha256 = "u0stt4w0iK4h+5PMkqjp9m8kqvrKvM3m7lBcV2yXPKU=";

     

       13
       13
       +
           sha256 = "NBERpDSY1FoGzD0AXJx1yTG37fjzw+VsTAgkIBfJdhs=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         dontBuild = true;

+2 -2

pkgs/development/tools/oq/default.nix

···

       8
       8
        
       

     

       9
       9
        
       crystal.buildCrystalPackage rec {

     

       10
       10
        
         pname = "oq";

     

       11
       11
       -
         version = "1.2.1";

     

       11
       11
       +
         version = "1.3.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "Blacksmoke16";

     

       15
       15
        
           repo = pname;

     

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

     

       17
       17
       -
           sha256 = "sha256-RJVAEbNLlYNnOL/RDG0R9f8fHhNWtR+IMnnjtLK4e34=";

     

       17
       17
       +
           sha256 = "sha256-oLy8Ts+wnI0LxtAH6vVqhS7nqNkaLs0/vK9GxfG4vU8=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ makeWrapper ];

+2 -2

pkgs/development/tools/pipenv/default.nix

···

       18
       18
        
       

     

       19
       19
        
       in buildPythonApplication rec {

     

       20
       20
        
         pname = "pipenv";

     

       21
       21
       -
         version = "2020.11.15";

     

       21
       21
       +
         version = "2021.5.29";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchPypi {

     

       24
       24
        
           inherit pname version;

     

       25
       25
       -
           sha256 = "8253fe6f9cfb3791a54da8a0571f73c918cb3457dd908684c1800a13a06ec4c1";

     

       25
       25
       +
           sha256 = "05958fadcd70b2de6a27542fcd2bd72dd5c59c6d35307fdac3e06361fb06e30e";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         LC_ALL = "en_US.UTF-8";

+2 -2

pkgs/development/tools/symfony-cli/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenvNoCC.mkDerivation rec {

     

       4
       4
        
         pname = "symfony-cli";

     

       5
       5
       -
         version = "4.26.0";

     

       5
       5
       +
         version = "4.26.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_amd64.gz";

     

       9
       9
       -
           sha256 = "sha256-fQZKRDLc6T+YEX443k6DnarSNV3Rbc2Y34ingJik+sc=";

     

       9
       9
       +
           sha256 = "sha256-les12GheTKr4XvZpE4YIyNMaXWizeB0COhDiMcYYC7o=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         dontBuild = true;

+3 -3

pkgs/development/tools/taplo-lsp/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "taplo-lsp";

     

       5
       5
       -
         version = "0.2.4";

     

       5
       5
       +
         version = "0.2.5";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchCrate {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "1a5v0x60iicv9snsr0a3lqbziyh38iqhiw11s2lqnr6l1hmp69jy";

     

       9
       9
       +
           sha256 = "0a8y2fdkflc7lq0q40j7dr80hbj56bbsc585isbd7lk6xavg7cvi";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         cargoSha256 = "0ak70cwxcviv86b4zrcgqaxhdm6fxsji03mnacvp4pwlwv84ikkc";

     

       12
       12
       +
         cargoSha256 = "133p5kmcfq5ksrri2f8jvnc1ljmsczq49gh3k0gmgby45yvy6xa1";

     

       13
       13
        
       

     

       14
       14
        
         # excludes test_tcp since it fails

     

       15
       15
        
         cargoTestFlags = [ "test_stdio" ];

+17

pkgs/misc/vscode-extensions/default.nix

···

       564
       564
        
               };

     

       565
       565
        
             };

     

       566
       566
        
       

     

       567
       567
       +
             faustinoaq.lex-flex-yacc-bison = buildVscodeMarketplaceExtension {

     

       568
       568
       +
               mktplcRef = {

     

       569
       569
       +
                 name = "lex-flex-yacc-bison";

     

       570
       570
       +
                 publisher = "faustinoaq";

     

       571
       571
       +
                 version = "0.0.3";

     

       572
       572
       +
                 sha256 = "6254f52157dc796eae7bf135ac88c1c9cc19d884625331a1e634f9768722cc3d";

     

       573
       573
       +
               };

     

       574
       574
       +
               meta = with lib; {

     

       575
       575
       +
                 changelog = "https://marketplace.visualstudio.com/items/faustinoaq.lex-flex-yacc-bison/changelog";

     

       576
       576
       +
                 description = "Language support for Lex, Flex, Yacc and Bison.";

     

       577
       577
       +
                 downloadPage = "https://marketplace.visualstudio.com/items?itemName=faustinoaq.lex-flex-yacc-bison";

     

       578
       578
       +
                 homepage = "https://github.com/faustinoaq/vscode-lex-flex-yacc-bison";

     

       579
       579
       +
                 license = licenses.mit;

     

       580
       580
       +
                 maintainers = with maintainers; [ angustrau ];

     

       581
       581
       +
               };

     

       582
       582
       +
             };

     

       583
       583
       +
       

     

       567
       584
        
             file-icons.file-icons = buildVscodeMarketplaceExtension {

     

       568
       585
        
               meta = with lib; {

     

       569
       586
        
                 changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog";

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         # having the full version string here makes it easier to update

     

       5
       5
       -
         modDirVersion = "5.14.1-zen1";

     

       5
       5
       +
         modDirVersion = "5.14.3-zen1";

     

       6
       6
        
         parts = lib.splitString "-" modDirVersion;

     

       7
       7
        
         version = lib.elemAt parts 0;

     

       8
       8
        
         suffix = lib.elemAt parts 1;

     
···

       19
       19
        
           owner = "zen-kernel";

     

       20
       20
        
           repo = "zen-kernel";

     

       21
       21
        
           rev = "v${modDirVersion}";

     

       22
       22
       -
           sha256 = "sha256-InfDIs+eELLJE5aw7mD8Jo7SlrpeI/ZuD3z4TyFf7/k=";

     

       22
       22
       +
           sha256 = "sha256-ByewBT+1z83jCuEMmNvtmhHaEk4qjHa2Kgue8wVfPIY=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         structuredExtraConfig = with lib.kernel; {

+7 -7

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

···

       207
       207
        
         # to be adapted

     

       208
       208
        
         zfsStable = common {

     

       209
       209
        
           # check the release notes for compatible kernels

     

       210
       210
       -
           kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14";

     

       211
       211
       -
           latestCompatibleLinuxPackages = linuxPackages_5_13;

     

       210
       210
       +
           kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15";

     

       211
       211
       +
           latestCompatibleLinuxPackages = linuxPackages_5_14;

     

       212
       212
        
       

     

       213
       213
        
           # this package should point to the latest release.

     

       214
       214
       -
           version = "2.1.0";

     

       214
       214
       +
           version = "2.1.1";

     

       215
       215
        
       

     

       216
       216
       -
           sha256 = "sha256-YdY4SStXZGBBdAHdM3R/unco7ztxI3s0/buPSNSeh5o=";

     

       216
       216
       +
           sha256 = "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY=";

     

       217
       217
        
         };

     

       218
       218
        
       

     

       219
       219
        
         zfsUnstable = common {

     

       220
       220
        
           # check the release notes for compatible kernels

     

       221
       221
        
           kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15";

     

       222
       222
       -
           latestCompatibleLinuxPackages = linuxPackages_5_13;

     

       222
       222
       +
           latestCompatibleLinuxPackages = linuxPackages_5_14;

     

       223
       223
        
       

     

       224
       224
        
           # this package should point to a version / git revision compatible with the latest kernel release

     

       225
       225
       -
           version = "unstable-2021-08-30";

     

       226
       226
       -
           rev = "3b89d9518df2c7fd747e349873a3d4d498beb20e";

     

       225
       225
       +
           version = "2.1.1";

     

       226
       226
       +
           # rev = "0000000000000000000000000000000000000000";

     

       227
       227
        
       

     

       228
       228
        
           sha256 = "sha256-wVbjpVrPQmhJmMqdGUf0IwlCIoOsT7Zfj5lxSKcOsgg=";

     

       229
       229

+2 -2

pkgs/servers/http/apache-httpd/2.4.nix

···

       17
       17
        
       assert http2Support -> nghttp2 != null;

     

       18
       18
        
       

     

       19
       19
        
       stdenv.mkDerivation rec {

     

       20
       20
       -
         version = "2.4.48";

     

       20
       20
       +
         version = "2.4.49";

     

       21
       21
        
         pname = "apache-httpd";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchurl {

     

       24
       24
        
           url = "mirror://apache/httpd/httpd-${version}.tar.bz2";

     

       25
       25
       -
           sha256 = "0v4npxnvih5mlxx6dywwhhfs8xvgcckc0hxzwk3hi0g8nbkjdj0v";

     

       25
       25
       +
           sha256 = "0fqkfjcpdd40ji2279wfxh5hddb5jdxlnpjr0sbhva8fi7b6bfb5";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         # FIXME: -dev depends on -doc

+4 -4

pkgs/servers/http/tomcat/default.nix

···

       32
       32
        
       in {

     

       33
       33
        
         tomcat9 = common {

     

       34
       34
        
           versionMajor = "9";

     

       35
       35
       -
           versionMinor = "0.46";

     

       36
       36
       -
           sha256 = "02p1d7xkmfna5brwi5imjz83g5va1g6fxkiaj4q22l8jpkr6xf6h";

     

       35
       35
       +
           versionMinor = "0.53";

     

       36
       36
       +
           sha256 = "1zdnbb0bfbi7762lz69li0wf48jbfz1mv637jzcl42vbsxp4agkv";

     

       37
       37
        
         };

     

       38
       38
        
       

     

       39
       39
        
         tomcat10 = common {

     

       40
       40
        
           versionMajor = "10";

     

       41
       41
       -
           versionMinor = "0.6";

     

       42
       42
       -
           sha256 = "1bpcxpsfws3b8ykq53vrcx3f04mvs5if80p329jm3x2dvdvj3d9n";

     

       41
       41
       +
           versionMinor = "0.11";

     

       42
       42
       +
           sha256 = "1hjvsxxxavni7bis1hm56281ffmf4x0zdh65zqkrnhqa1rbs0lg2";

     

       43
       43
        
         };

     

       44
       44
        
       }

+2 -2

pkgs/servers/http/tomcat/tomcat-native.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "tomcat-native";

     

       5
       5
       -
         version = "1.2.30";

     

       5
       5
       +
         version = "1.2.31";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz";

     

       9
       9
       -
           sha512 = "51a8c55214de166cace193c3330abe77cabea56c2d05efc8c3408bc06369c328899376c94c572725ebe2887f2faf99fea05d1819fa84c712d57fd309d0476953";

     

       9
       9
       +
           sha512 = "2aaa93f0acf3eb780d39faeda3ece3cf053d3b6e2918462f7183070e8ab32232e035e9062f7c07ceb621006d727d3596d9b4b948f4432b4f625327b72fdb0e49";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         sourceRoot = "${pname}-${version}-src/native";

+3 -3

pkgs/servers/libreddit/default.nix

···

       8
       8
        
       

     

       9
       9
        
       rustPlatform.buildRustPackage rec {

     

       10
       10
        
         pname = "libreddit";

     

       11
       11
       -
         version = "0.14.14";

     

       11
       11
       +
         version = "0.15.1";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "spikecodes";

     

       15
       15
        
           repo = pname;

     

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

     

       17
       17
       -
           sha256 = "sha256-duirX+X8moByV1urdgXjzTQ2zOfCfz7etzjDxkSKvhk=";

     

       17
       17
       +
           sha256 = "sha256-Df2WedLOz4wpot0Isy3JCF5p1sV9Hx3bkTNp1KkSfHQ=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         cargoSha256 = "sha256-pFCERBnN386rW8ajpLWUHteCTWRmEiR19Sp5d8HXc5Y=";

     

       20
       20
       +
         cargoSha256 = "sha256-eR/0gpuEBQ7gHrSmJqGaM4vqKwg9WZdVVnBU4DgJcVQ=";

     

       21
       21
        
       

     

       22
       22
        
         buildInputs = lib.optional stdenv.isDarwin Security;

     

       23
       23

+3 -3

pkgs/servers/livepeer/default.nix

···

       4
       4
        
       

     

       5
       5
        
       buildGoModule rec {

     

       6
       6
        
         pname = "livepeer";

     

       7
       7
       -
         version = "0.5.15";

     

       7
       7
       +
         version = "0.5.20";

     

       8
       8
        
       

     

       9
       9
        
         runVend = true;

     

       10
       10
       -
         vendorSha256 = "sha256-PhkdbixJDA9Ym4cK5ALIYJgDQnO5GTbZ0XGsVHcvYYQ=";

     

       10
       10
       +
         vendorSha256 = "sha256-iFVScV3arPkBjMi8sCHIja4G2QeQDb2sgBrbTFyxKyw=";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "livepeer";

     

       14
       14
        
           repo = "go-livepeer";

     

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

     

       16
       16
       -
           sha256 = "sha256-ZB80QssqN9SBpmYk/QgPRVF88qedmNeUG+EkjxWz4rQ=";

     

       16
       16
       +
           sha256 = "sha256-cOxIL093Mi+g9Al/SQJ6vdaeBAXUN6ZGsSaVvEIiJpU=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         # livepeer_cli has a vendoring problem

+3 -3

pkgs/servers/monitoring/grafana/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "grafana";

     

       5
       5
       -
         version = "8.1.3";

     

       5
       5
       +
         version = "8.1.4";

     

       6
       6
        
       

     

       7
       7
        
         excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)";

     

       8
       8
        
       

     
···

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

     

       11
       11
        
           owner = "grafana";

     

       12
       12
        
           repo = "grafana";

     

       13
       13
       -
           sha256 = "sha256-gJO21qTTiP6/8Oln0w89UYEYWb6pIlXvKfiALAUAjnM=";

     

       13
       13
       +
           sha256 = "sha256-fBeiJL40TXY5UHdNUYQhy4wzuaoCidHAidN7aWJ2GnQ=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         srcStatic = fetchurl {

     

       17
       17
        
           url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";

     

       18
       18
       -
           sha256 = "sha256-1ZZMZEErt/OD55mEu/mF2XrsZcDVk700jRkTcYK14rE=";

     

       18
       18
       +
           sha256 = "sha256-a1fY4W8ZfA9wSb1DiNixTnwKhfoJ+salaRXcy1Y2t9Y=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         vendorSha256 = "sha256-DFD6orsM5oDOLgHbCbrD+zNKVGbQT3Izm1VtNCZO40I=";

+1 -1

pkgs/servers/monitoring/zabbix/agent2.nix

···

       12
       12
        
       

     

       13
       13
        
           modRoot = "src/go";

     

       14
       14
        
       

     

       15
       15
       -
           vendorSha256 = "07caz0jfy0r1vb1h9mhb169wyn949z9xj0pmvyamr2d8y3k3hbyd";

     

       15
       15
       +
           vendorSha256 = "1iyi7lnknr42gbv25illqnnjc7mshv73ih9anc6rxbf87n9s46ac";

     

       16
       16
        
       

     

       17
       17
        
           nativeBuildInputs = [ autoreconfHook pkg-config ];

     

       18
       18
        
           buildInputs = [ libiconv openssl pcre zlib ];

+4 -4

pkgs/servers/monitoring/zabbix/versions.nix

···

       1
       1
        
       generic: {

     

       2
       2
        
         v50 = generic {

     

       3
       3
       -
           version = "5.0.12";

     

       4
       4
       -
           sha256 = "1gxlsmvz3m3dm4qqgx5qg5zjs680salah17mdzm3m27w8srg13i5";

     

       3
       3
       +
           version = "5.0.15";

     

       4
       4
       +
           sha256 = "1q9xwixzdj3w9qmarpp8xbkjphsz4m185br8g6i9f96676hrw5ww";

     

       5
       5
        
         };

     

       6
       6
        
       

     

       7
       7
        
         v40 = generic {

     

       8
       8
       -
           version = "4.0.31";

     

       9
       9
       -
           sha256 = "1jfawwwqzd9bsywsn4qc7d1j2a4i8d92xg16k0f3y34pbmfm4603";

     

       8
       8
       +
           version = "4.0.33";

     

       9
       9
       +
           sha256 = "05pdqiql6xv1l7cn2piydsfjiaw6np0rbl1n5wg7bc7r4ikiyp4v";

     

       10
       10
        
         };

     

       11
       11
        
       }

+6 -5

pkgs/servers/sql/postgresql/ext/pg_ed25519.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, postgresql }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitLab, postgresql }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "pg_ed25519";

     

       5
       5
        
         version = "0.2";

     

       6
       6
       -
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "https://gitlab.com/dwagin/${pname}/-/archive/${version}/${pname}-${version}.tar.bz2";

     

       9
       9
       -
           sha256 = "0q46pvk1vq5w3al6i3inzlw6w7za3n7p1gd4wfbbxzvzh7qnynda";

     

       6
       6
       +
         src = fetchFromGitLab {

     

       7
       7
       +
           owner = "dwagin";

     

       8
       8
       +
           repo = "pg_ed25519";

     

       9
       9
       +
           rev = version;

     

       10
       10
       +
           sha256 = "16w3qx3wj81bzfhydl2pjhn8b1jak6h7ja9wq1kc626g0siggqi0";

     

       10
       11
        
         };

     

       11
       12
        
       

     

       12
       13
        
         buildInputs = [ postgresql ];

+3 -3

pkgs/shells/zsh/oh-my-zsh/default.nix

···

       5
       5
        
       , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
       -
         version = "2021-09-10";

     

       8
       8
       +
         version = "2021-09-15";

     

       9
       9
        
         pname = "oh-my-zsh";

     

       10
       10
       -
         rev = "735808f48d54aabce540f6c90294e21118104cf4";

     

       10
       10
       +
         rev = "93b557e291ba60286bcd49f5d3e4ac61730b3f7c";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           inherit rev;

     

       14
       14
        
           owner = "ohmyzsh";

     

       15
       15
        
           repo = "ohmyzsh";

     

       16
       16
       -
           sha256 = "fd/Y6kBqO/RO+LMUdCgGGHdHXWghj1YU+Pch5RLNAP0=";

     

       16
       16
       +
           sha256 = "71vJHlr+g8a+mTGBn4Bupog1lsmukJhl+qT8aVnd8pk=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         installPhase = ''

+2 -2

pkgs/tools/misc/profetch/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "profetch";

     

       5
       5
       -
         version = "0.1.6";

     

       5
       5
       +
         version = "0.1.7";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "RustemB";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "1clh3l50wz6mlrw9kx0wh2bbhnz6bsksyh4ngz7givv4y3g9m702";

     

       11
       11
       +
           sha256 = "sha256-JsjpPUXMN0jytRS4yzSjrseqHiEQ+YinklG+tIIy+Zo=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ gprolog ];

+3 -3

pkgs/tools/security/grype/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "grype";

     

       9
       9
       -
         version = "0.17.0";

     

       9
       9
       +
         version = "0.19.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "anchore";

     

       13
       13
        
           repo = pname;

     

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

     

       15
       15
       -
           sha256 = "sha256-410mCfYzbqgj3hb3dgVOGPWPCIYrB41soLA8dXK23NE=";

     

       15
       15
       +
           sha256 = "sha256-xSjmwD0V4+LKfLwknQU8PAFOG3zpJ87ghHdA2c+nYQM=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         vendorSha256 = "sha256-KkS/1VSObniAykAwv7uW+RCrdvb5BM6DbHzDWZ6kPoQ=";

     

       18
       18
       +
         vendorSha256 = "sha256-mlsKB/WOiQ2Ud9C19rsQhVtJfblh0CGd8tDs+3SSfcg=";

     

       19
       19
        
       

     

       20
       20
        
         propagatedBuildInputs = [ docker ];

     

       21
       21

+6

pkgs/top-level/all-packages.nix

···

       7051
       7051
        
       

     

       7052
       7052
        
         ltris = callPackage ../games/ltris { };

     

       7053
       7053
        
       

     

       7054
       7054
       +
         lunatic = callPackage ../development/interpreters/lunatic { };

     

       7055
       7055
       +
       

     

       7054
       7056
        
         lv = callPackage ../tools/text/lv { };

     

       7055
       7057
        
       

     

       7056
       7058
        
         lxc = callPackage ../os-specific/linux/lxc {

     
···

       19577
       19579
        
           inherit (haskellPackages) Agda;

     

       19578
       19580
        
         };

     

       19579
       19581
        
         agda = agdaPackages.agda;

     

       19582
       19582
       +
       

     

       19583
       19583
       +
         ### DEVELOPMENT / LIBRARIES / BASH

     

       19584
       19584
       +
       

     

       19585
       19585
       +
         bash-preexec = callPackage ../development/libraries/bash/bash-preexec { };

     

       19580
       19586
        
       

     

       19581
       19587
        
         ### DEVELOPMENT / LIBRARIES / JAVA

     

       19582
       19588

+9 -9

pkgs/top-level/python-packages.nix

···

       56
       56
        
         # See build-setupcfg/default.nix for documentation.

     

       57
       57
        
         buildSetupcfg = import ../build-support/build-setupcfg self;

     

       58
       58
        
       

     

       59
       59
       -
         fetchPypi = callPackage ../development/interpreters/python/fetchpypi.nix {};

     

       59
       59
       +
         fetchPypi = callPackage ../development/interpreters/python/fetchpypi.nix { };

     

       60
       60
        
       

     

       61
       61
        
         # Check whether a derivation provides a Python module.

     

       62
       62
        
         hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python;

     
···

       1479
       1479
        
       

     

       1480
       1480
        
         class-registry = callPackage ../development/python-modules/class-registry { };

     

       1481
       1481
        
       

     

       1482
       1482
       -
         claripy =  callPackage ../development/python-modules/claripy { };

     

       1482
       1482
       +
         claripy = callPackage ../development/python-modules/claripy { };

     

       1483
       1483
        
       

     

       1484
       1484
        
         cld2-cffi = callPackage ../development/python-modules/cld2-cffi { };

     

       1485
       1485
        
       

     
···

       1521
       1521
        
       

     

       1522
       1522
        
         click-threading = callPackage ../development/python-modules/click-threading { };

     

       1523
       1523
        
       

     

       1524
       1524
       -
         clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash {};

     

       1524
       1524
       +
         clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash { };

     

       1525
       1525
        
       

     

       1526
       1526
        
         clickhouse-cli = callPackage ../development/python-modules/clickhouse-cli { };

     

       1527
       1527
        
       

     

       1528
       1528
       -
         clickhouse-driver = callPackage ../development/python-modules/clickhouse-driver {};

     

       1528
       1528
       +
         clickhouse-driver = callPackage ../development/python-modules/clickhouse-driver { };

     

       1529
       1529
        
       

     

       1530
       1530
        
         cliff = callPackage ../development/python-modules/cliff { };

     

       1531
       1531
        
       

     
···

       2372
       2372
        
       

     

       2373
       2373
        
         env-canada = callPackage ../development/python-modules/env-canada { };

     

       2374
       2374
        
       

     

       2375
       2375
       -
         environmental-override = callPackage ../development/python-modules/environmental-override {};

     

       2375
       2375
       +
         environmental-override = callPackage ../development/python-modules/environmental-override { };

     

       2376
       2376
        
       

     

       2377
       2377
        
         envisage = callPackage ../development/python-modules/envisage { };

     

       2378
       2378
        
       

     
···

       3266
       3266
        
       

     

       3267
       3267
        
         guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { };

     

       3268
       3268
        
       

     

       3269
       3269
       -
         gvm-tools = callPackage ../development/python-modules/gvm-tools {};

     

       3269
       3269
       +
         gvm-tools = callPackage ../development/python-modules/gvm-tools { };

     

       3270
       3270
        
       

     

       3271
       3271
       -
         gviz-api = callPackage ../development/python-modules/gviz-api {};

     

       3271
       3271
       +
         gviz-api = callPackage ../development/python-modules/gviz-api { };

     

       3272
       3272
        
       

     

       3273
       3273
        
         gym = callPackage ../development/python-modules/gym { };

     

       3274
       3274
        
       

     
···

       7652
       7652
        
       

     

       7653
       7653
        
         queuelib = callPackage ../development/python-modules/queuelib { };

     

       7654
       7654
        
       

     

       7655
       7655
       -
         qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict {};

     

       7655
       7655
       +
         qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict { };

     

       7656
       7656
        
       

     

       7657
       7657
        
         r2pipe = callPackage ../development/python-modules/r2pipe { };

     

       7658
       7658
        
       

     
···

       8766
       8766
        
       

     

       8767
       8767
        
         tensorboard-plugin-profile = callPackage ../development/python-modules/tensorboard-plugin-profile { };

     

       8768
       8768
        
       

     

       8769
       8769
       -
         tensorboard-plugin-wit = callPackage ../development/python-modules/tensorboard-plugin-wit {};

     

       8769
       8769
       +
         tensorboard-plugin-wit = callPackage ../development/python-modules/tensorboard-plugin-wit { };

     

       8770
       8770
        
       

     

       8771
       8771
        
         tensorboardx = callPackage ../development/python-modules/tensorboardx { };

     

       8772
       8772