commit 6d46d8a9b9bc7fbb9e0d341ee7d3fed503236ebb · pyrox.dev/nixpkgs

+10 -2

maintainers/scripts/build.nix

···

       1
       1
       -
       { maintainer }:

     

       1
       1
       +
       { maintainer

     

       2
       2
       +
       , localSystem ? { system = args.system or builtins.currentSystem; }

     

       3
       3
       +
       , system ? localSystem.system

     

       4
       4
       +
       , crossSystem ? localSystem

     

       5
       5
       +
       , ...

     

       6
       6
       +
       }@args:

     

       2
       7
        
       

     

       3
       8
        
       # based on update.nix

     

       4
       9
        
       # nix-build build.nix --argstr maintainer <yourname>

     

       5
       10
        
       

     

       11
       11
       +
       # to build for aarch64-linux using boot.binfmt.emulatedSystems:

     

       12
       12
       +
       # nix-build build.nix --argstr maintainer <yourname> --argstr system aarch64-linux

     

       13
       13
       +
       

     

       6
       14
        
       let

     

       7
       7
       -
         pkgs = import ./../../default.nix {};

     

       15
       15
       +
         pkgs = import ./../../default.nix (removeAttrs args [ "maintainer" ]);

     

       8
       16
        
         maintainer_ = pkgs.lib.maintainers.${maintainer};

     

       9
       17
        
         packagesWith = cond: return: set:

     

       10
       18
        
           (pkgs.lib.flatten

+2 -2

nixos/modules/misc/ids.nix

···

       315
       315
        
             restya-board = 284;

     

       316
       316
        
             mighttpd2 = 285;

     

       317
       317
        
             hass = 286;

     

       318
       318
       -
             monero = 287;

     

       318
       318
       +
             #monero = 287; # dynamically allocated as of 2021-05-08

     

       319
       319
        
             ceph = 288;

     

       320
       320
        
             duplicati = 289;

     

       321
       321
        
             monetdb = 290;

     
···

       617
       617
        
             restya-board = 284;

     

       618
       618
        
             mighttpd2 = 285;

     

       619
       619
        
             hass = 286;

     

       620
       620
       -
             monero = 287;

     

       620
       620
       +
             # monero = 287; # dynamically allocated as of 2021-05-08

     

       621
       621
        
             ceph = 288;

     

       622
       622
        
             duplicati = 289;

     

       623
       623
        
             monetdb = 290;

+13 -7

nixos/modules/services/networking/monero.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         cfg     = config.services.monero;

     

       7
       7
       -
         dataDir = "/var/lib/monero";

     

       8
       7
        
       

     

       9
       8
        
         listToConf = option: list:

     

       10
       9
        
           concatMapStrings (value: "${option}=${value}\n") list;

     
···

       53
       52
        
       

     

       54
       53
        
             enable = mkEnableOption "Monero node daemon";

     

       55
       54
        
       

     

       55
       55
       +
             dataDir = mkOption {

     

       56
       56
       +
               type = types.str;

     

       57
       57
       +
               default = "/var/lib/monero";

     

       58
       58
       +
               description = ''

     

       59
       59
       +
                 The directory where Monero stores its data files.

     

       60
       60
       +
               '';

     

       61
       61
       +
             };

     

       62
       62
       +
       

     

       56
       63
        
             mining.enable = mkOption {

     

       57
       64
        
               type = types.bool;

     

       58
       65
        
               default = false;

     

       59
       66
        
               description = ''

     

       60
       60
       -
                 Whether to mine moneroj.

     

       67
       67
       +
                 Whether to mine monero.

     

       61
       68
        
               '';

     

       62
       69
        
             };

     

       63
       70
        
       

     
···

       198
       205
        
         config = mkIf cfg.enable {

     

       199
       206
        
       

     

       200
       207
        
           users.users.monero = {

     

       201
       201
       -
             uid  = config.ids.uids.monero;

     

       208
       208
       +
             isSystemUser = true;

     

       209
       209
       +
             group = "monero";

     

       202
       210
        
             description = "Monero daemon user";

     

       203
       203
       -
             home = dataDir;

     

       211
       211
       +
             home = cfg.dataDir;

     

       204
       212
        
             createHome = true;

     

       205
       213
        
           };

     

       206
       214
        
       

     

       207
       207
       -
           users.groups.monero = {

     

       208
       208
       -
             gid = config.ids.gids.monero;

     

       209
       209
       -
           };

     

       215
       215
       +
           users.groups.monero = { };

     

       210
       216
        
       

     

       211
       217
        
           systemd.services.monero = {

     

       212
       218
        
             description = "monero daemon";

+3

nixos/tests/docker-tools-cross.nix

···

       73
       73
        
                   "docker rmi ${hello2.imageName}",

     

       74
       74
        
               )

     

       75
       75
        
         '';

     

       76
       76
       +
       

     

       77
       77
       +
         # Remove when the formatter has been removed and a linter has been added

     

       78
       78
       +
         skipLint = true;

     

       76
       79
        
       })

+4 -1

nixos/tests/docker-tools-overlay.nix

···

       4
       4
        
       {

     

       5
       5
        
         name = "docker-tools-overlay";

     

       6
       6
        
         meta = with pkgs.lib.maintainers; {

     

       7
       7
       -
           maintainers = [ lnl7 ];

     

       7
       7
       +
           maintainers = [ lnl7 roberth ];

     

       8
       8
        
         };

     

       9
       9
        
       

     

       10
       10
        
         nodes = {

     
···

       30
       30
        
             # drw------- 99 0 0 100 Apr 14 11:36 /nix/store

     

       31
       31
        
             docker.succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version")

     

       32
       32
        
           '';

     

       33
       33
       +
       

     

       34
       34
       +
         # Remove when the formatter has been removed and a linter has been added

     

       35
       35
       +
         skipLint = true;

     

       33
       36
        
       })

+4 -1

nixos/tests/docker-tools.nix

···

       3
       3
        
       import ./make-test-python.nix ({ pkgs, ... }: {

     

       4
       4
        
         name = "docker-tools";

     

       5
       5
        
         meta = with pkgs.lib.maintainers; {

     

       6
       6
       -
           maintainers = [ lnl7 ];

     

       6
       6
       +
           maintainers = [ lnl7 roberth ];

     

       7
       7
        
         };

     

       8
       8
        
       

     

       9
       9
        
         nodes = {

     
···

       365
       365
        
                   "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'"

     

       366
       366
        
               )

     

       367
       367
        
         '';

     

       368
       368
       +
       

     

       369
       369
       +
         # Remove when the formatter has been removed and a linter has been added

     

       370
       370
       +
         skipLint = true;

     

       368
       371
        
       })

+2 -1

nixos/tests/systemd-confinement.nix

···

       59
       59
        
                         "chroot-exec chown 65534 /bin",

     

       60
       60
        
                     )

     

       61
       61
        
                     machine.succeed(

     

       62
       62
       -
                         'test "$(chroot-exec id -u)" = 0', "chroot-exec chown 0 /bin",

     

       62
       62
       +
                         'test "$(chroot-exec id -u)" = 0',

     

       63
       63
       +
                         "chroot-exec chown 0 /bin",

     

       63
       64
        
                     )

     

       64
       65
        
               '';

     

       65
       66
        
             }

+12 -2

pkgs/applications/audio/guitarix/default.nix

···

       1
       1
        
       { lib, stdenv

     

       2
       2
        
       , fetchurl

     

       3
       3
       +
       , fetchpatch

     

       3
       4
        
       , avahi

     

       4
       5
        
       , bluez

     

       5
       6
        
       , boost

     
···

       41
       42
        
       

     

       42
       43
        
       stdenv.mkDerivation rec {

     

       43
       44
        
         pname = "guitarix";

     

       44
       44
       -
         version = "0.41.0";

     

       45
       45
       +
         version = "0.42.1";

     

       45
       46
        
       

     

       46
       47
        
         src = fetchurl {

     

       47
       48
        
           url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz";

     

       48
       48
       -
           sha256 = "0qsfbyrrpb3bbdyq68k28mjql7kglxh8nqcw9jvja28x6x9ik5a0";

     

       49
       49
       +
           sha256 = "101c2hdpipj3s6rmva5wf3q9hfjv7bkyzi7s8sgaiys8f7h4czkr";

     

       49
       50
        
         };

     

       51
       51
       +
       

     

       52
       52
       +
         patches = [

     

       53
       53
       +
           (fetchpatch {

     

       54
       54
       +
             name = "guitarix-gcc11.patch";

     

       55
       55
       +
             url = "https://github.com/brummer10/guitarix/commit/d8f003484c57d808682025dfb07a7a1fb848afdc.patch";

     

       56
       56
       +
             stripLen = 1;

     

       57
       57
       +
             sha256 = "1qhlbf18cn6m9jdz3741nrdfqvznjna3daqmn9l10k5nd3asy4il";

     

       58
       58
       +
           })

     

       59
       59
       +
         ];

     

       50
       60
        
       

     

       51
       61
        
         nativeBuildInputs = [

     

       52
       62
        
           gettext

+2 -2

pkgs/applications/audio/quodlibet/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome, gtk3, gdk-pixbuf, librsvg,

     

       2
       2
       -
         tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme,

     

       2
       2
       +
         tag ? "", xvfb-run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme,

     

       3
       3
        
         gst_all_1, withGstPlugins ? true,

     

       4
       4
        
         xineBackend ? false, xine-lib,

     

       5
       5
        
         withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false,

     
···

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ wrapGAppsHook gettext ];

     

       22
       22
        
       

     

       23
       23
       -
         checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb_run dbus.daemon glibcLocales ]);

     

       23
       23
       +
         checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb-run dbus.daemon glibcLocales ]);

     

       24
       24
        
       

     

       25
       25
        
         buildInputs = [ gnome.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]

     

       26
       26
        
           ++ (if xineBackend then [ xine-lib ] else with gst_all_1;

+2 -2

pkgs/applications/audio/sublime-music/default.nix

···

       5
       5
        
       , gtk3

     

       6
       6
        
       , pango

     

       7
       7
        
       , wrapGAppsHook

     

       8
       8
       -
       , xvfb_run

     

       8
       8
       +
       , xvfb-run

     

       9
       9
        
       , chromecastSupport ? false

     

       10
       10
        
       , serverSupport ? false

     

       11
       11
        
       , keyringSupport ? true

     
···

       66
       66
        
           pytest

     

       67
       67
        
           pytest-cov

     

       68
       68
        
         ];

     

       69
       69
       -
         checkPhase = "${xvfb_run}/bin/xvfb-run pytest";

     

       69
       69
       +
         checkPhase = "${xvfb-run}/bin/xvfb-run pytest";

     

       70
       70
        
       

     

       71
       71
        
         # Also run the python import check for sanity

     

       72
       72
        
         pythonImportsCheck = [ "sublime_music" ];

-23

pkgs/applications/blockchains/ethabi.nix

···

       1
       1
       -
       { lib, fetchFromGitHub, rustPlatform }:

     

       2
       2
       -
       

     

       3
       3
       -
       rustPlatform.buildRustPackage rec {

     

       4
       4
       -
         pname = "ethabi";

     

       5
       5
       -
         version = "11.0.0";

     

       6
       6
       -
       

     

       7
       7
       -
         src = fetchFromGitHub {

     

       8
       8
       -
           owner = "paritytech";

     

       9
       9
       -
           repo = "ethabi";

     

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

     

       11
       11
       -
           sha256 = "1gqd3vwsvv1wvi659qcdywgmh41swblpwmmxb033k8irw581dwq4";

     

       12
       12
       -
         };

     

       13
       13
       -
       

     

       14
       14
       -
         cargoSha256 = "1hx8qw51rl7sn9jmnclw0hc4rx619hf78hpaih5mvny3k0zgiwpm";

     

       15
       15
       -
       

     

       16
       16
       -
         meta = with lib; {

     

       17
       17
       -
           description = "Ethereum function call encoding (ABI) utility";

     

       18
       18
       -
           homepage = "https://github.com/ethcore/ethabi/";

     

       19
       19
       -
           maintainers = [ maintainers.dbrock ];

     

       20
       20
       -
           license = licenses.gpl3;

     

       21
       21
       -
           inherit version;

     

       22
       22
       -
         };

     

       23
       23
       -
       }

+683

pkgs/applications/blockchains/ethabi/add-Cargo-lock.patch

···

       1
       1
       +
       diff --git a/Cargo.lock b/Cargo.lock

     

       2
       2
       +
       new file mode 100644

     

       3
       3
       +
       index 0000000..05e3f0f

     

       4
       4
       +
       --- /dev/null

     

       5
       5
       +
       +++ b/Cargo.lock

     

       6
       6
       +
       @@ -0,0 +1,677 @@

     

       7
       7
       +
       +# This file is automatically @generated by Cargo.

     

       8
       8
       +
       +# It is not intended for manual editing.

     

       9
       9
       +
       +[[package]]

     

       10
       10
       +
       +name = "ansi_term"

     

       11
       11
       +
       +version = "0.11.0"

     

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

     

       13
       13
       +
       +checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"

     

       14
       14
       +
       +dependencies = [

     

       15
       15
       +
       + "winapi",

     

       16
       16
       +
       +]

     

       17
       17
       +
       +

     

       18
       18
       +
       +[[package]]

     

       19
       19
       +
       +name = "anyhow"

     

       20
       20
       +
       +version = "1.0.40"

     

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

     

       22
       22
       +
       +checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b"

     

       23
       23
       +
       +

     

       24
       24
       +
       +[[package]]

     

       25
       25
       +
       +name = "arrayvec"

     

       26
       26
       +
       +version = "0.5.2"

     

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

     

       28
       28
       +
       +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"

     

       29
       29
       +
       +

     

       30
       30
       +
       +[[package]]

     

       31
       31
       +
       +name = "atty"

     

       32
       32
       +
       +version = "0.2.14"

     

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

     

       34
       34
       +
       +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"

     

       35
       35
       +
       +dependencies = [

     

       36
       36
       +
       + "hermit-abi",

     

       37
       37
       +
       + "libc",

     

       38
       38
       +
       + "winapi",

     

       39
       39
       +
       +]

     

       40
       40
       +
       +

     

       41
       41
       +
       +[[package]]

     

       42
       42
       +
       +name = "bitflags"

     

       43
       43
       +
       +version = "1.2.1"

     

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

     

       45
       45
       +
       +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"

     

       46
       46
       +
       +

     

       47
       47
       +
       +[[package]]

     

       48
       48
       +
       +name = "bitvec"

     

       49
       49
       +
       +version = "0.17.4"

     

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

     

       51
       51
       +
       +checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c"

     

       52
       52
       +
       +dependencies = [

     

       53
       53
       +
       + "either",

     

       54
       54
       +
       + "radium",

     

       55
       55
       +
       +]

     

       56
       56
       +
       +

     

       57
       57
       +
       +[[package]]

     

       58
       58
       +
       +name = "block-buffer"

     

       59
       59
       +
       +version = "0.9.0"

     

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

     

       61
       61
       +
       +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"

     

       62
       62
       +
       +dependencies = [

     

       63
       63
       +
       + "block-padding",

     

       64
       64
       +
       + "generic-array",

     

       65
       65
       +
       +]

     

       66
       66
       +
       +

     

       67
       67
       +
       +[[package]]

     

       68
       68
       +
       +name = "block-padding"

     

       69
       69
       +
       +version = "0.2.1"

     

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

     

       71
       71
       +
       +checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"

     

       72
       72
       +
       +

     

       73
       73
       +
       +[[package]]

     

       74
       74
       +
       +name = "byte-slice-cast"

     

       75
       75
       +
       +version = "0.3.5"

     

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

     

       77
       77
       +
       +checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3"

     

       78
       78
       +
       +

     

       79
       79
       +
       +[[package]]

     

       80
       80
       +
       +name = "byteorder"

     

       81
       81
       +
       +version = "1.4.3"

     

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

     

       83
       83
       +
       +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"

     

       84
       84
       +
       +

     

       85
       85
       +
       +[[package]]

     

       86
       86
       +
       +name = "bytes"

     

       87
       87
       +
       +version = "1.0.1"

     

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

     

       89
       89
       +
       +checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"

     

       90
       90
       +
       +

     

       91
       91
       +
       +[[package]]

     

       92
       92
       +
       +name = "cfg-if"

     

       93
       93
       +
       +version = "1.0.0"

     

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

     

       95
       95
       +
       +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

     

       96
       96
       +
       +

     

       97
       97
       +
       +[[package]]

     

       98
       98
       +
       +name = "clap"

     

       99
       99
       +
       +version = "2.33.3"

     

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

     

       101
       101
       +
       +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"

     

       102
       102
       +
       +dependencies = [

     

       103
       103
       +
       + "ansi_term",

     

       104
       104
       +
       + "atty",

     

       105
       105
       +
       + "bitflags",

     

       106
       106
       +
       + "strsim",

     

       107
       107
       +
       + "textwrap",

     

       108
       108
       +
       + "unicode-width",

     

       109
       109
       +
       + "vec_map",

     

       110
       110
       +
       +]

     

       111
       111
       +
       +

     

       112
       112
       +
       +[[package]]

     

       113
       113
       +
       +name = "crunchy"

     

       114
       114
       +
       +version = "0.2.2"

     

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

     

       116
       116
       +
       +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"

     

       117
       117
       +
       +

     

       118
       118
       +
       +[[package]]

     

       119
       119
       +
       +name = "digest"

     

       120
       120
       +
       +version = "0.9.0"

     

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

     

       122
       122
       +
       +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"

     

       123
       123
       +
       +dependencies = [

     

       124
       124
       +
       + "generic-array",

     

       125
       125
       +
       +]

     

       126
       126
       +
       +

     

       127
       127
       +
       +[[package]]

     

       128
       128
       +
       +name = "either"

     

       129
       129
       +
       +version = "1.6.1"

     

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

     

       131
       131
       +
       +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"

     

       132
       132
       +
       +

     

       133
       133
       +
       +[[package]]

     

       134
       134
       +
       +name = "ethabi"

     

       135
       135
       +
       +version = "13.0.0"

     

       136
       136
       +
       +dependencies = [

     

       137
       137
       +
       + "anyhow",

     

       138
       138
       +
       + "ethereum-types",

     

       139
       139
       +
       + "hex",

     

       140
       140
       +
       + "hex-literal",

     

       141
       141
       +
       + "paste",

     

       142
       142
       +
       + "serde",

     

       143
       143
       +
       + "serde_json",

     

       144
       144
       +
       + "sha3",

     

       145
       145
       +
       + "thiserror",

     

       146
       146
       +
       + "uint",

     

       147
       147
       +
       +]

     

       148
       148
       +
       +

     

       149
       149
       +
       +[[package]]

     

       150
       150
       +
       +name = "ethabi-cli"

     

       151
       151
       +
       +version = "13.0.0"

     

       152
       152
       +
       +dependencies = [

     

       153
       153
       +
       + "anyhow",

     

       154
       154
       +
       + "ethabi",

     

       155
       155
       +
       + "hex",

     

       156
       156
       +
       + "itertools",

     

       157
       157
       +
       + "sha3",

     

       158
       158
       +
       + "structopt",

     

       159
       159
       +
       +]

     

       160
       160
       +
       +

     

       161
       161
       +
       +[[package]]

     

       162
       162
       +
       +name = "ethabi-contract"

     

       163
       163
       +
       +version = "11.0.0"

     

       164
       164
       +
       +

     

       165
       165
       +
       +[[package]]

     

       166
       166
       +
       +name = "ethabi-derive"

     

       167
       167
       +
       +version = "13.0.0"

     

       168
       168
       +
       +dependencies = [

     

       169
       169
       +
       + "anyhow",

     

       170
       170
       +
       + "ethabi",

     

       171
       171
       +
       + "heck",

     

       172
       172
       +
       + "proc-macro2",

     

       173
       173
       +
       + "quote",

     

       174
       174
       +
       + "syn",

     

       175
       175
       +
       +]

     

       176
       176
       +
       +

     

       177
       177
       +
       +[[package]]

     

       178
       178
       +
       +name = "ethabi-tests"

     

       179
       179
       +
       +version = "0.1.1"

     

       180
       180
       +
       +dependencies = [

     

       181
       181
       +
       + "ethabi",

     

       182
       182
       +
       + "ethabi-contract",

     

       183
       183
       +
       + "ethabi-derive",

     

       184
       184
       +
       + "hex",

     

       185
       185
       +
       + "hex-literal",

     

       186
       186
       +
       +]

     

       187
       187
       +
       +

     

       188
       188
       +
       +[[package]]

     

       189
       189
       +
       +name = "ethbloom"

     

       190
       190
       +
       +version = "0.10.0"

     

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

     

       192
       192
       +
       +checksum = "22a621dcebea74f2a6f2002d0a885c81ccf6cbdf86760183316a7722b5707ca4"

     

       193
       193
       +
       +dependencies = [

     

       194
       194
       +
       + "crunchy",

     

       195
       195
       +
       + "fixed-hash",

     

       196
       196
       +
       + "impl-rlp",

     

       197
       197
       +
       + "impl-serde",

     

       198
       198
       +
       + "tiny-keccak",

     

       199
       199
       +
       +]

     

       200
       200
       +
       +

     

       201
       201
       +
       +[[package]]

     

       202
       202
       +
       +name = "ethereum-types"

     

       203
       203
       +
       +version = "0.10.0"

     

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

     

       205
       205
       +
       +checksum = "05dc5f0df4915fa6dff7f975a8366ecfaaa8959c74235469495153e7bb1b280e"

     

       206
       206
       +
       +dependencies = [

     

       207
       207
       +
       + "ethbloom",

     

       208
       208
       +
       + "fixed-hash",

     

       209
       209
       +
       + "impl-rlp",

     

       210
       210
       +
       + "impl-serde",

     

       211
       211
       +
       + "primitive-types",

     

       212
       212
       +
       + "uint",

     

       213
       213
       +
       +]

     

       214
       214
       +
       +

     

       215
       215
       +
       +[[package]]

     

       216
       216
       +
       +name = "fixed-hash"

     

       217
       217
       +
       +version = "0.7.0"

     

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

     

       219
       219
       +
       +checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"

     

       220
       220
       +
       +dependencies = [

     

       221
       221
       +
       + "byteorder",

     

       222
       222
       +
       + "rand",

     

       223
       223
       +
       + "rustc-hex",

     

       224
       224
       +
       + "static_assertions",

     

       225
       225
       +
       +]

     

       226
       226
       +
       +

     

       227
       227
       +
       +[[package]]

     

       228
       228
       +
       +name = "generic-array"

     

       229
       229
       +
       +version = "0.14.4"

     

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

     

       231
       231
       +
       +checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"

     

       232
       232
       +
       +dependencies = [

     

       233
       233
       +
       + "typenum",

     

       234
       234
       +
       + "version_check",

     

       235
       235
       +
       +]

     

       236
       236
       +
       +

     

       237
       237
       +
       +[[package]]

     

       238
       238
       +
       +name = "getrandom"

     

       239
       239
       +
       +version = "0.2.2"

     

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

     

       241
       241
       +
       +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"

     

       242
       242
       +
       +dependencies = [

     

       243
       243
       +
       + "cfg-if",

     

       244
       244
       +
       + "libc",

     

       245
       245
       +
       + "wasi",

     

       246
       246
       +
       +]

     

       247
       247
       +
       +

     

       248
       248
       +
       +[[package]]

     

       249
       249
       +
       +name = "heck"

     

       250
       250
       +
       +version = "0.3.2"

     

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

     

       252
       252
       +
       +checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac"

     

       253
       253
       +
       +dependencies = [

     

       254
       254
       +
       + "unicode-segmentation",

     

       255
       255
       +
       +]

     

       256
       256
       +
       +

     

       257
       257
       +
       +[[package]]

     

       258
       258
       +
       +name = "hermit-abi"

     

       259
       259
       +
       +version = "0.1.18"

     

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

     

       261
       261
       +
       +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"

     

       262
       262
       +
       +dependencies = [

     

       263
       263
       +
       + "libc",

     

       264
       264
       +
       +]

     

       265
       265
       +
       +

     

       266
       266
       +
       +[[package]]

     

       267
       267
       +
       +name = "hex"

     

       268
       268
       +
       +version = "0.4.3"

     

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

     

       270
       270
       +
       +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"

     

       271
       271
       +
       +

     

       272
       272
       +
       +[[package]]

     

       273
       273
       +
       +name = "hex-literal"

     

       274
       274
       +
       +version = "0.3.1"

     

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

     

       276
       276
       +
       +checksum = "5af1f635ef1bc545d78392b136bfe1c9809e029023c84a3638a864a10b8819c8"

     

       277
       277
       +
       +

     

       278
       278
       +
       +[[package]]

     

       279
       279
       +
       +name = "impl-codec"

     

       280
       280
       +
       +version = "0.4.2"

     

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

     

       282
       282
       +
       +checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53"

     

       283
       283
       +
       +dependencies = [

     

       284
       284
       +
       + "parity-scale-codec",

     

       285
       285
       +
       +]

     

       286
       286
       +
       +

     

       287
       287
       +
       +[[package]]

     

       288
       288
       +
       +name = "impl-rlp"

     

       289
       289
       +
       +version = "0.3.0"

     

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

     

       291
       291
       +
       +checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808"

     

       292
       292
       +
       +dependencies = [

     

       293
       293
       +
       + "rlp",

     

       294
       294
       +
       +]

     

       295
       295
       +
       +

     

       296
       296
       +
       +[[package]]

     

       297
       297
       +
       +name = "impl-serde"

     

       298
       298
       +
       +version = "0.3.1"

     

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

     

       300
       300
       +
       +checksum = "b47ca4d2b6931707a55fce5cf66aff80e2178c8b63bbb4ecb5695cbc870ddf6f"

     

       301
       301
       +
       +dependencies = [

     

       302
       302
       +
       + "serde",

     

       303
       303
       +
       +]

     

       304
       304
       +
       +

     

       305
       305
       +
       +[[package]]

     

       306
       306
       +
       +name = "itertools"

     

       307
       307
       +
       +version = "0.9.0"

     

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

     

       309
       309
       +
       +checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"

     

       310
       310
       +
       +dependencies = [

     

       311
       311
       +
       + "either",

     

       312
       312
       +
       +]

     

       313
       313
       +
       +

     

       314
       314
       +
       +[[package]]

     

       315
       315
       +
       +name = "itoa"

     

       316
       316
       +
       +version = "0.4.7"

     

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

     

       318
       318
       +
       +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"

     

       319
       319
       +
       +

     

       320
       320
       +
       +[[package]]

     

       321
       321
       +
       +name = "keccak"

     

       322
       322
       +
       +version = "0.1.0"

     

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

     

       324
       324
       +
       +checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"

     

       325
       325
       +
       +

     

       326
       326
       +
       +[[package]]

     

       327
       327
       +
       +name = "lazy_static"

     

       328
       328
       +
       +version = "1.4.0"

     

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

     

       330
       330
       +
       +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

     

       331
       331
       +
       +

     

       332
       332
       +
       +[[package]]

     

       333
       333
       +
       +name = "libc"

     

       334
       334
       +
       +version = "0.2.94"

     

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

     

       336
       336
       +
       +checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"

     

       337
       337
       +
       +

     

       338
       338
       +
       +[[package]]

     

       339
       339
       +
       +name = "opaque-debug"

     

       340
       340
       +
       +version = "0.3.0"

     

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

     

       342
       342
       +
       +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"

     

       343
       343
       +
       +

     

       344
       344
       +
       +[[package]]

     

       345
       345
       +
       +name = "parity-scale-codec"

     

       346
       346
       +
       +version = "1.3.7"

     

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

     

       348
       348
       +
       +checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d"

     

       349
       349
       +
       +dependencies = [

     

       350
       350
       +
       + "arrayvec",

     

       351
       351
       +
       + "bitvec",

     

       352
       352
       +
       + "byte-slice-cast",

     

       353
       353
       +
       + "serde",

     

       354
       354
       +
       +]

     

       355
       355
       +
       +

     

       356
       356
       +
       +[[package]]

     

       357
       357
       +
       +name = "paste"

     

       358
       358
       +
       +version = "1.0.5"

     

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

     

       360
       360
       +
       +checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58"

     

       361
       361
       +
       +

     

       362
       362
       +
       +[[package]]

     

       363
       363
       +
       +name = "ppv-lite86"

     

       364
       364
       +
       +version = "0.2.10"

     

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

     

       366
       366
       +
       +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"

     

       367
       367
       +
       +

     

       368
       368
       +
       +[[package]]

     

       369
       369
       +
       +name = "primitive-types"

     

       370
       370
       +
       +version = "0.8.0"

     

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

     

       372
       372
       +
       +checksum = "b3824ae2c5e27160113b9e029a10ec9e3f0237bad8029f69c7724393c9fdefd8"

     

       373
       373
       +
       +dependencies = [

     

       374
       374
       +
       + "fixed-hash",

     

       375
       375
       +
       + "impl-codec",

     

       376
       376
       +
       + "impl-rlp",

     

       377
       377
       +
       + "impl-serde",

     

       378
       378
       +
       + "uint",

     

       379
       379
       +
       +]

     

       380
       380
       +
       +

     

       381
       381
       +
       +[[package]]

     

       382
       382
       +
       +name = "proc-macro-error"

     

       383
       383
       +
       +version = "1.0.4"

     

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

     

       385
       385
       +
       +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"

     

       386
       386
       +
       +dependencies = [

     

       387
       387
       +
       + "proc-macro-error-attr",

     

       388
       388
       +
       + "proc-macro2",

     

       389
       389
       +
       + "quote",

     

       390
       390
       +
       + "syn",

     

       391
       391
       +
       + "version_check",

     

       392
       392
       +
       +]

     

       393
       393
       +
       +

     

       394
       394
       +
       +[[package]]

     

       395
       395
       +
       +name = "proc-macro-error-attr"

     

       396
       396
       +
       +version = "1.0.4"

     

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

     

       398
       398
       +
       +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"

     

       399
       399
       +
       +dependencies = [

     

       400
       400
       +
       + "proc-macro2",

     

       401
       401
       +
       + "quote",

     

       402
       402
       +
       + "version_check",

     

       403
       403
       +
       +]

     

       404
       404
       +
       +

     

       405
       405
       +
       +[[package]]

     

       406
       406
       +
       +name = "proc-macro2"

     

       407
       407
       +
       +version = "1.0.26"

     

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

     

       409
       409
       +
       +checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"

     

       410
       410
       +
       +dependencies = [

     

       411
       411
       +
       + "unicode-xid",

     

       412
       412
       +
       +]

     

       413
       413
       +
       +

     

       414
       414
       +
       +[[package]]

     

       415
       415
       +
       +name = "quote"

     

       416
       416
       +
       +version = "1.0.9"

     

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

     

       418
       418
       +
       +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"

     

       419
       419
       +
       +dependencies = [

     

       420
       420
       +
       + "proc-macro2",

     

       421
       421
       +
       +]

     

       422
       422
       +
       +

     

       423
       423
       +
       +[[package]]

     

       424
       424
       +
       +name = "radium"

     

       425
       425
       +
       +version = "0.3.0"

     

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

     

       427
       427
       +
       +checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac"

     

       428
       428
       +
       +

     

       429
       429
       +
       +[[package]]

     

       430
       430
       +
       +name = "rand"

     

       431
       431
       +
       +version = "0.8.3"

     

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

     

       433
       433
       +
       +checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"

     

       434
       434
       +
       +dependencies = [

     

       435
       435
       +
       + "libc",

     

       436
       436
       +
       + "rand_chacha",

     

       437
       437
       +
       + "rand_core",

     

       438
       438
       +
       +]

     

       439
       439
       +
       +

     

       440
       440
       +
       +[[package]]

     

       441
       441
       +
       +name = "rand_chacha"

     

       442
       442
       +
       +version = "0.3.0"

     

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

     

       444
       444
       +
       +checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"

     

       445
       445
       +
       +dependencies = [

     

       446
       446
       +
       + "ppv-lite86",

     

       447
       447
       +
       + "rand_core",

     

       448
       448
       +
       +]

     

       449
       449
       +
       +

     

       450
       450
       +
       +[[package]]

     

       451
       451
       +
       +name = "rand_core"

     

       452
       452
       +
       +version = "0.6.2"

     

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

     

       454
       454
       +
       +checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"

     

       455
       455
       +
       +dependencies = [

     

       456
       456
       +
       + "getrandom",

     

       457
       457
       +
       +]

     

       458
       458
       +
       +

     

       459
       459
       +
       +[[package]]

     

       460
       460
       +
       +name = "rlp"

     

       461
       461
       +
       +version = "0.5.0"

     

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

     

       463
       463
       +
       +checksum = "e54369147e3e7796c9b885c7304db87ca3d09a0a98f72843d532868675bbfba8"

     

       464
       464
       +
       +dependencies = [

     

       465
       465
       +
       + "bytes",

     

       466
       466
       +
       + "rustc-hex",

     

       467
       467
       +
       +]

     

       468
       468
       +
       +

     

       469
       469
       +
       +[[package]]

     

       470
       470
       +
       +name = "rustc-hex"

     

       471
       471
       +
       +version = "2.1.0"

     

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

     

       473
       473
       +
       +checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"

     

       474
       474
       +
       +

     

       475
       475
       +
       +[[package]]

     

       476
       476
       +
       +name = "ryu"

     

       477
       477
       +
       +version = "1.0.5"

     

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

     

       479
       479
       +
       +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"

     

       480
       480
       +
       +

     

       481
       481
       +
       +[[package]]

     

       482
       482
       +
       +name = "serde"

     

       483
       483
       +
       +version = "1.0.125"

     

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

     

       485
       485
       +
       +checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"

     

       486
       486
       +
       +dependencies = [

     

       487
       487
       +
       + "serde_derive",

     

       488
       488
       +
       +]

     

       489
       489
       +
       +

     

       490
       490
       +
       +[[package]]

     

       491
       491
       +
       +name = "serde_derive"

     

       492
       492
       +
       +version = "1.0.125"

     

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

     

       494
       494
       +
       +checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"

     

       495
       495
       +
       +dependencies = [

     

       496
       496
       +
       + "proc-macro2",

     

       497
       497
       +
       + "quote",

     

       498
       498
       +
       + "syn",

     

       499
       499
       +
       +]

     

       500
       500
       +
       +

     

       501
       501
       +
       +[[package]]

     

       502
       502
       +
       +name = "serde_json"

     

       503
       503
       +
       +version = "1.0.64"

     

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

     

       505
       505
       +
       +checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"

     

       506
       506
       +
       +dependencies = [

     

       507
       507
       +
       + "itoa",

     

       508
       508
       +
       + "ryu",

     

       509
       509
       +
       + "serde",

     

       510
       510
       +
       +]

     

       511
       511
       +
       +

     

       512
       512
       +
       +[[package]]

     

       513
       513
       +
       +name = "sha3"

     

       514
       514
       +
       +version = "0.9.1"

     

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

     

       516
       516
       +
       +checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"

     

       517
       517
       +
       +dependencies = [

     

       518
       518
       +
       + "block-buffer",

     

       519
       519
       +
       + "digest",

     

       520
       520
       +
       + "keccak",

     

       521
       521
       +
       + "opaque-debug",

     

       522
       522
       +
       +]

     

       523
       523
       +
       +

     

       524
       524
       +
       +[[package]]

     

       525
       525
       +
       +name = "static_assertions"

     

       526
       526
       +
       +version = "1.1.0"

     

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

     

       528
       528
       +
       +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"

     

       529
       529
       +
       +

     

       530
       530
       +
       +[[package]]

     

       531
       531
       +
       +name = "strsim"

     

       532
       532
       +
       +version = "0.8.0"

     

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

     

       534
       534
       +
       +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"

     

       535
       535
       +
       +

     

       536
       536
       +
       +[[package]]

     

       537
       537
       +
       +name = "structopt"

     

       538
       538
       +
       +version = "0.3.21"

     

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

     

       540
       540
       +
       +checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c"

     

       541
       541
       +
       +dependencies = [

     

       542
       542
       +
       + "clap",

     

       543
       543
       +
       + "lazy_static",

     

       544
       544
       +
       + "structopt-derive",

     

       545
       545
       +
       +]

     

       546
       546
       +
       +

     

       547
       547
       +
       +[[package]]

     

       548
       548
       +
       +name = "structopt-derive"

     

       549
       549
       +
       +version = "0.4.14"

     

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

     

       551
       551
       +
       +checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90"

     

       552
       552
       +
       +dependencies = [

     

       553
       553
       +
       + "heck",

     

       554
       554
       +
       + "proc-macro-error",

     

       555
       555
       +
       + "proc-macro2",

     

       556
       556
       +
       + "quote",

     

       557
       557
       +
       + "syn",

     

       558
       558
       +
       +]

     

       559
       559
       +
       +

     

       560
       560
       +
       +[[package]]

     

       561
       561
       +
       +name = "syn"

     

       562
       562
       +
       +version = "1.0.72"

     

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

     

       564
       564
       +
       +checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"

     

       565
       565
       +
       +dependencies = [

     

       566
       566
       +
       + "proc-macro2",

     

       567
       567
       +
       + "quote",

     

       568
       568
       +
       + "unicode-xid",

     

       569
       569
       +
       +]

     

       570
       570
       +
       +

     

       571
       571
       +
       +[[package]]

     

       572
       572
       +
       +name = "textwrap"

     

       573
       573
       +
       +version = "0.11.0"

     

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

     

       575
       575
       +
       +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"

     

       576
       576
       +
       +dependencies = [

     

       577
       577
       +
       + "unicode-width",

     

       578
       578
       +
       +]

     

       579
       579
       +
       +

     

       580
       580
       +
       +[[package]]

     

       581
       581
       +
       +name = "thiserror"

     

       582
       582
       +
       +version = "1.0.24"

     

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

     

       584
       584
       +
       +checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"

     

       585
       585
       +
       +dependencies = [

     

       586
       586
       +
       + "thiserror-impl",

     

       587
       587
       +
       +]

     

       588
       588
       +
       +

     

       589
       589
       +
       +[[package]]

     

       590
       590
       +
       +name = "thiserror-impl"

     

       591
       591
       +
       +version = "1.0.24"

     

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

     

       593
       593
       +
       +checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"

     

       594
       594
       +
       +dependencies = [

     

       595
       595
       +
       + "proc-macro2",

     

       596
       596
       +
       + "quote",

     

       597
       597
       +
       + "syn",

     

       598
       598
       +
       +]

     

       599
       599
       +
       +

     

       600
       600
       +
       +[[package]]

     

       601
       601
       +
       +name = "tiny-keccak"

     

       602
       602
       +
       +version = "2.0.2"

     

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

     

       604
       604
       +
       +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"

     

       605
       605
       +
       +dependencies = [

     

       606
       606
       +
       + "crunchy",

     

       607
       607
       +
       +]

     

       608
       608
       +
       +

     

       609
       609
       +
       +[[package]]

     

       610
       610
       +
       +name = "typenum"

     

       611
       611
       +
       +version = "1.13.0"

     

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

     

       613
       613
       +
       +checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"

     

       614
       614
       +
       +

     

       615
       615
       +
       +[[package]]

     

       616
       616
       +
       +name = "uint"

     

       617
       617
       +
       +version = "0.9.0"

     

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

     

       619
       619
       +
       +checksum = "e11fe9a9348741cf134085ad57c249508345fe16411b3d7fb4ff2da2f1d6382e"

     

       620
       620
       +
       +dependencies = [

     

       621
       621
       +
       + "byteorder",

     

       622
       622
       +
       + "crunchy",

     

       623
       623
       +
       + "hex",

     

       624
       624
       +
       + "static_assertions",

     

       625
       625
       +
       +]

     

       626
       626
       +
       +

     

       627
       627
       +
       +[[package]]

     

       628
       628
       +
       +name = "unicode-segmentation"

     

       629
       629
       +
       +version = "1.7.1"

     

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

     

       631
       631
       +
       +checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"

     

       632
       632
       +
       +

     

       633
       633
       +
       +[[package]]

     

       634
       634
       +
       +name = "unicode-width"

     

       635
       635
       +
       +version = "0.1.8"

     

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

     

       637
       637
       +
       +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"

     

       638
       638
       +
       +

     

       639
       639
       +
       +[[package]]

     

       640
       640
       +
       +name = "unicode-xid"

     

       641
       641
       +
       +version = "0.2.2"

     

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

     

       643
       643
       +
       +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"

     

       644
       644
       +
       +

     

       645
       645
       +
       +[[package]]

     

       646
       646
       +
       +name = "vec_map"

     

       647
       647
       +
       +version = "0.8.2"

     

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

     

       649
       649
       +
       +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"

     

       650
       650
       +
       +

     

       651
       651
       +
       +[[package]]

     

       652
       652
       +
       +name = "version_check"

     

       653
       653
       +
       +version = "0.9.3"

     

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

     

       655
       655
       +
       +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"

     

       656
       656
       +
       +

     

       657
       657
       +
       +[[package]]

     

       658
       658
       +
       +name = "wasi"

     

       659
       659
       +
       +version = "0.10.2+wasi-snapshot-preview1"

     

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

     

       661
       661
       +
       +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"

     

       662
       662
       +
       +

     

       663
       663
       +
       +[[package]]

     

       664
       664
       +
       +name = "winapi"

     

       665
       665
       +
       +version = "0.3.9"

     

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

     

       667
       667
       +
       +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"

     

       668
       668
       +
       +dependencies = [

     

       669
       669
       +
       + "winapi-i686-pc-windows-gnu",

     

       670
       670
       +
       + "winapi-x86_64-pc-windows-gnu",

     

       671
       671
       +
       +]

     

       672
       672
       +
       +

     

       673
       673
       +
       +[[package]]

     

       674
       674
       +
       +name = "winapi-i686-pc-windows-gnu"

     

       675
       675
       +
       +version = "0.4.0"

     

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

     

       677
       677
       +
       +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"

     

       678
       678
       +
       +

     

       679
       679
       +
       +[[package]]

     

       680
       680
       +
       +name = "winapi-x86_64-pc-windows-gnu"

     

       681
       681
       +
       +version = "0.4.0"

     

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

     

       683
       683
       +
       +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

+25

pkgs/applications/blockchains/ethabi/default.nix

···

       1
       1
       +
       { lib, fetchFromGitHub, rustPlatform }:

     

       2
       2
       +
       

     

       3
       3
       +
       rustPlatform.buildRustPackage rec {

     

       4
       4
       +
         pname = "ethabi";

     

       5
       5
       +
         version = "13.0.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "rust-ethereum";

     

       9
       9
       +
           repo = "ethabi";

     

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

     

       11
       11
       +
           sha256 = "sha256-bl46CSVP1MMYI3tkVAHFrjMFwTt8QoleZCV9pMIMZyc=";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         cargoSha256 = "sha256-Jz0uEP2/ZjLS+GbCp7lNyJQdFDjTSFthjBdC/Z4tkTs=";

     

       15
       15
       +
       

     

       16
       16
       +
         cargoPatches = [ ./add-Cargo-lock.patch ];

     

       17
       17
       +
       

     

       18
       18
       +
         meta = with lib; {

     

       19
       19
       +
           description = "Ethereum function call encoding (ABI) utility";

     

       20
       20
       +
           homepage = "https://github.com/rust-ethereum/ethabi";

     

       21
       21
       +
           maintainers = [ maintainers.dbrock ];

     

       22
       22
       +
           license = licenses.asl20;

     

       23
       23
       +
           inherit version;

     

       24
       24
       +
         };

     

       25
       25
       +
       }

+2 -2

pkgs/applications/editors/gnome-builder/default.nix

···

       34
       34
        
       , webkitgtk

     

       35
       35
        
       , wrapGAppsHook

     

       36
       36
        
       , dbus

     

       37
       37
       -
       , xvfb_run

     

       37
       37
       +
       , xvfb-run

     

       38
       38
        
       }:

     

       39
       39
        
       

     

       40
       40
        
       stdenv.mkDerivation rec {

     
···

       89
       89
        
       

     

       90
       90
        
         checkInputs = [

     

       91
       91
        
           dbus

     

       92
       92
       -
           xvfb_run

     

       92
       92
       +
           xvfb-run

     

       93
       93
        
         ];

     

       94
       94
        
       

     

       95
       95
        
         outputs = [ "out" "devdoc" ];

+2 -2

pkgs/applications/graphics/gscan2pdf/default.nix

···

       4
       4
        
         # runtime dependencies

     

       5
       5
        
         imagemagick, libtiff, djvulibre, poppler_utils, ghostscript, unpaper, pdftk,

     

       6
       6
        
         # test dependencies

     

       7
       7
       -
         xvfb_run, liberation_ttf, file, tesseract }:

     

       7
       7
       +
         xvfb-run, liberation_ttf, file, tesseract }:

     

       8
       8
        
       

     

       9
       9
        
       with lib;

     

       10
       10
        
       

     
···

       94
       94
        
           unpaper

     

       95
       95
        
           pdftk

     

       96
       96
        
       

     

       97
       97
       -
           xvfb_run

     

       97
       97
       +
           xvfb-run

     

       98
       98
        
           file

     

       99
       99
        
           tesseract # tests are expecting tesseract 3.x precisely

     

       100
       100
        
         ] ++ (with perlPackages; [

+2 -2

pkgs/applications/graphics/vimiv/default.nix

···

       2
       2
        
       , gnome

     

       3
       3
        
       

     

       4
       4
        
       # Test requirements

     

       5
       5
       -
       , dbus, xvfb_run, xdotool

     

       5
       5
       +
       , dbus, xvfb-run, xdotool

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       python3Packages.buildPythonApplication rec {

     
···

       37
       37
        
             vimiv/imageactions.py

     

       38
       38
        
         '';

     

       39
       39
        
       

     

       40
       40
       -
         checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ];

     

       40
       40
       +
         checkInputs = [ python3Packages.nose dbus.daemon xvfb-run xdotool ];

     

       41
       41
        
         buildInputs = [ gnome.adwaita-icon-theme librsvg ];

     

       42
       42
        
         propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ];

     

       43
       43

+2 -2

pkgs/applications/misc/girara/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, meson, ninja, pkg-config, check, dbus, xvfb_run, glib, gtk, gettext, libiconv, json_c, libintl

     

       1
       1
       +
       { lib, stdenv, fetchurl, meson, ninja, pkg-config, check, dbus, xvfb-run, glib, gtk, gettext, libiconv, json_c, libintl

     

       2
       2
        
       }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     
···

       12
       12
        
           sha256 = "1n3i960b458172mc3pkq7m9dn5qxry6fms3c3k06v27cjp5whsyf";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         nativeBuildInputs = [ meson ninja pkg-config gettext check dbus xvfb_run ];

     

       15
       15
       +
         nativeBuildInputs = [ meson ninja pkg-config gettext check dbus xvfb-run ];

     

       16
       16
        
         buildInputs = [ libintl libiconv json_c ];

     

       17
       17
        
         propagatedBuildInputs = [ glib gtk ];

     

       18
       18

+2 -2

pkgs/applications/misc/pytrainer/default.nix

···

       13
       13
        
       , tzdata

     

       14
       14
        
       , webkitgtk

     

       15
       15
        
       , wrapGAppsHook

     

       16
       16
       -
       , xvfb_run

     

       16
       16
       +
       , xvfb-run

     

       17
       17
        
       }:

     

       18
       18
        
       

     

       19
       19
        
       let

     
···

       66
       66
        
         checkInputs = [

     

       67
       67
        
           glibcLocales

     

       68
       68
        
           perl

     

       69
       69
       -
           xvfb_run

     

       69
       69
       +
           xvfb-run

     

       70
       70
        
         ] ++ (with python.pkgs; [

     

       71
       71
        
           mysqlclient

     

       72
       72
        
           psycopg2

+2 -2

pkgs/applications/misc/ulauncher/default.nix

···

       14
       14
        
       , libappindicator

     

       15
       15
        
       , intltool

     

       16
       16
        
       , wmctrl

     

       17
       17
       -
       , xvfb_run

     

       17
       17
       +
       , xvfb-run

     

       18
       18
        
       , librsvg

     

       19
       19
        
       }:

     

       20
       20
        
       

     
···

       66
       66
        
           mock

     

       67
       67
        
           pytest

     

       68
       68
        
           pytest-mock

     

       69
       69
       -
           xvfb_run

     

       69
       69
       +
           xvfb-run

     

       70
       70
        
         ];

     

       71
       71
        
       

     

       72
       72
        
         patches = [

+9 -1

pkgs/applications/misc/xneur/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, pkg-config, intltool, xorg, pcre, gst_all_1, glib

     

       1
       1
       +
       { lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, xorg, pcre, gst_all_1, glib

     

       2
       2
        
       , xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation {

     
···

       19
       19
        
           xosd xorg.libXext xorg.libXi libnotify

     

       20
       20
        
           enchant gdk-pixbuf

     

       21
       21
        
           gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good

     

       22
       22
       +
         ];

     

       23
       23
       +
       

     

       24
       24
       +
         patches = [

     

       25
       25
       +
           (fetchpatch {

     

       26
       26
       +
             name = "gcc-10.patch";

     

       27
       27
       +
             url = "https://salsa.debian.org/debian/xneur/-/raw/da38ad9c8e1bf4e349f5ed4ad909f810fdea44c9/debian/patches/gcc-10.patch";

     

       28
       28
       +
             sha256 = "0pc17a4sdrnrc4z7gz28889b9ywqsm5mzm6m41h67j2f5zh9k3fy";

     

       29
       29
       +
           })

     

       22
       30
        
         ];

     

       23
       31
        
       

     

       24
       32
        
         postPatch = ''

+2 -2

pkgs/applications/networking/calls/default.nix

···

       21
       21
        
       , dbus

     

       22
       22
        
       , vala

     

       23
       23
        
       , wrapGAppsHook

     

       24
       24
       -
       , xvfb_run

     

       24
       24
       +
       , xvfb-run

     

       25
       25
        
       , gtk-doc

     

       26
       26
        
       , docbook-xsl-nons

     

       27
       27
        
       , docbook_xml_dtd_43

     
···

       71
       71
        
       

     

       72
       72
        
         checkInputs = [

     

       73
       73
        
           dbus

     

       74
       74
       -
           xvfb_run

     

       74
       74
       +
           xvfb-run

     

       75
       75
        
         ];

     

       76
       76
        
       

     

       77
       77
        
         NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

+2 -2

pkgs/applications/networking/flent/default.nix

···

       1
       1
        
       { lib, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python

     

       2
       2
       -
       , pythonPackages, qt5, sphinx, xvfb_run }:

     

       2
       2
       +
       , pythonPackages, qt5, sphinx, xvfb-run }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonApplication rec {

     

       5
       5
        
         pname = "flent";

     
···

       12
       12
        
         buildInputs = [ sphinx ];

     

       13
       13
        
         nativeBuildInputs = [ qt5.wrapQtAppsHook ];

     

       14
       14
        
         propagatedBuildInputs = [ matplotlib procps pyqt5 ];

     

       15
       15
       -
         checkInputs = [ procps pythonPackages.mock pyqt5 xvfb_run ];

     

       15
       15
       +
         checkInputs = [ procps pythonPackages.mock pyqt5 xvfb-run ];

     

       16
       16
        
       

     

       17
       17
        
         checkPhase = ''

     

       18
       18
        
           cat >test-runner <<EOF

+2 -2

pkgs/applications/networking/instant-messengers/gajim/default.nix

···

       5
       5
        
       , glib-networking

     

       6
       6
        
       

     

       7
       7
        
       # Test dependencies

     

       8
       8
       -
       , xvfb_run, dbus

     

       8
       8
       +
       , xvfb-run, dbus

     

       9
       9
        
       

     

       10
       10
        
       # Optional dependencies

     

       11
       11
        
       , enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-good, libnice

     
···

       52
       52
        
           ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]

     

       53
       53
        
           ++ extraPythonPackages python3.pkgs;

     

       54
       54
        
       

     

       55
       55
       -
         checkInputs = [ xvfb_run dbus.daemon ];

     

       55
       55
       +
         checkInputs = [ xvfb-run dbus.daemon ];

     

       56
       56
        
       

     

       57
       57
        
         checkPhase = ''

     

       58
       58
        
           # https://dev.gajim.org/gajim/gajim/-/issues/10478

+2 -2

pkgs/applications/office/gtg/default.nix

···

       11
       11
        
       , pango

     

       12
       12
        
       , gdk-pixbuf

     

       13
       13
        
       , gobject-introspection

     

       14
       14
       -
       , xvfb_run

     

       14
       14
       +
       , xvfb-run

     

       15
       15
        
       }:

     

       16
       16
        
       

     

       17
       17
        
       python3Packages.buildPythonApplication rec {

     
···

       53
       53
        
         checkInputs = with python3Packages; [

     

       54
       54
        
           nose

     

       55
       55
        
           mock

     

       56
       56
       -
           xvfb_run

     

       56
       56
       +
           xvfb-run

     

       57
       57
        
         ];

     

       58
       58
        
       

     

       59
       59
        
         preBuild = ''

+2 -2

pkgs/applications/office/kmymoney/default.nix

···

       8
       8
        
       , sqlcipher

     

       9
       9
        
       

     

       10
       10
        
       # Needed for running tests:

     

       11
       11
       -
       , qtbase, xvfb_run

     

       11
       11
       +
       , qtbase, xvfb-run

     

       12
       12
        
       

     

       13
       13
        
       , python2, python3Packages

     

       14
       14
        
       }:

     
···

       55
       55
        
         '';

     

       56
       56
        
       

     

       57
       57
        
         doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;

     

       58
       58
       -
         installCheckInputs = [ xvfb_run ];

     

       58
       58
       +
         installCheckInputs = [ xvfb-run ];

     

       59
       59
        
         installCheckPhase =

     

       60
       60
        
           lib.optionalString doInstallCheck ''

     

       61
       61
        
             xvfb-run -s '-screen 0 1024x768x24' make test \

+2 -2

pkgs/applications/office/paperwork/paperwork-gtk.nix

···

       4
       4
        
       , cairo

     

       5
       5
        
       , gnome

     

       6
       6
        
       , librsvg

     

       7
       7
       -
       , xvfb_run

     

       7
       7
       +
       , xvfb-run

     

       8
       8
        
       , dbus

     

       9
       9
        
       , libnotify

     

       10
       10
        
       , wrapGAppsHook

     
···

       53
       53
        
           done

     

       54
       54
        
         '';

     

       55
       55
        
       

     

       56
       56
       -
         checkInputs = [ xvfb_run dbus.daemon ];

     

       56
       56
       +
         checkInputs = [ xvfb-run dbus.daemon ];

     

       57
       57
        
       

     

       58
       58
        
         nativeBuildInputs = [

     

       59
       59
        
           wrapGAppsHook

+8

pkgs/applications/video/dvdstyler/default.nix

···

       6
       6
        
       , docbook5

     

       7
       7
        
       , dvdauthor

     

       8
       8
        
       , dvdplusrwtools

     

       9
       9
       +
       , ffmpeg

     

       9
       10
        
       , flex

     

       10
       11
        
       , fontconfig

     

       11
       12
        
       , gettext

     

       13
       13
       +
       , libexif

     

       12
       14
        
       , makeWrapper

     

       13
       15
        
       , pkg-config

     

       16
       16
       +
       , wxGTK30

     

       14
       17
        
       , wxSVG

     

       15
       18
        
       , xine-ui

     

       16
       19
        
       , xmlto

     
···

       42
       45
        
           docbook5

     

       43
       46
        
           dvdauthor

     

       44
       47
        
           dvdplusrwtools

     

       48
       48
       +
           ffmpeg

     

       45
       49
        
           flex

     

       46
       50
        
           fontconfig

     

       47
       51
        
           gettext

     

       52
       52
       +
           libexif

     

       48
       53
        
           makeWrapper

     

       49
       54
        
           wxSVG

     

       55
       55
       +
           wxGTK30

     

       50
       56
        
           xine-ui

     

       51
       57
        
           xmlto

     

       52
       58
        
           zip

     
···

       66
       72
        
           ''

     

       67
       73
        
              wrapProgram $out/bin/dvdstyler --prefix PATH ":" "${binPath}"

     

       68
       74
        
           '';

     

       75
       75
       +
       

     

       76
       76
       +
         enableParallelBuilding = true;

     

       69
       77
        
       

     

       70
       78
        
         meta = with lib; {

     

       71
       79
        
           homepage = "https://www.dvdstyler.org/";

+14 -4

pkgs/applications/video/qmediathekview/default.nix

···

       1
       1
       -
       { mkDerivation, lib, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkg-config }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , mkDerivation

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , boost

     

       6
       6
       +
       , qtbase

     

       7
       7
       +
       , xz

     

       8
       8
       +
       , qmake

     

       9
       9
       +
       , pkg-config

     

       10
       10
       +
       }:

     

       2
       11
        
       

     

       3
       12
        
       mkDerivation rec {

     

       4
       13
        
         pname = "QMediathekView";

     

       5
       5
       -
         version = "2019-01-06";

     

       14
       14
       +
         version = "0.2.1";

     

       6
       15
        
       

     

       7
       16
        
         src = fetchFromGitHub {

     

       8
       17
        
           owner = "adamreichold";

     

       9
       18
        
           repo = pname;

     

       10
       10
       -
           rev = "e098aaec552ec4e367078bf19953a08067316b4b";

     

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

     

       11
       20
        
           sha256 = "0i9hac9alaajbra3lx23m0iiq6ww4is00lpbzg5x70agjrwj0nd6";

     

       12
       21
        
         };

     

       13
       22
        
       

     
···

       16
       25
        
             --replace /usr ""

     

       17
       26
        
         '';

     

       18
       27
        
       

     

       19
       19
       -
         buildInputs = [ qtbase qttools xz boost ];

     

       28
       28
       +
         buildInputs = [ qtbase xz boost ];

     

       20
       29
        
       

     

       21
       30
        
         nativeBuildInputs = [ qmake pkg-config ];

     

       22
       31
        
       

     
···

       28
       37
        
           license = licenses.gpl3Plus;

     

       29
       38
        
           platforms = platforms.linux;

     

       30
       39
        
           maintainers = with maintainers; [ dotlambda ];

     

       40
       40
       +
           broken = stdenv.isAarch64;

     

       31
       41
        
         };

     

       32
       42
        
       }

-2

pkgs/applications/video/xine-ui/default.nix

···

       46
       46
        
           xorgproto

     

       47
       47
        
         ]);

     

       48
       48
        
       

     

       49
       49
       -
         postPatch = "sed -e '/curl\/types\.h/d' -i src/xitk/download.c";

     

       50
       50
       -
       

     

       51
       49
        
         configureFlags = [ "--with-readline=${readline.dev}" ];

     

       52
       50
        
       

     

       53
       51
        
         LIRC_CFLAGS="-I${lirc}/include";

+4 -4

pkgs/applications/window-managers/dwm/dwm-status.nix

···

       9
       9
        
       

     

       10
       10
        
       rustPlatform.buildRustPackage rec {

     

       11
       11
        
         pname = "dwm-status";

     

       12
       12
       -
         version = "unstable-2021-05-04";

     

       12
       12
       +
         version = "1.7.2";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "Gerschtli";

     

       16
       16
        
           repo = pname;

     

       17
       17
       -
           rev = "c5b1fda78a8175cb53df9d31ae037c58279df810";

     

       18
       18
       -
           sha256 = "sha256-dJUQ7vuz9OC6eU00Snbbza63j01ms54sXO1kqheun+8=";

     

       17
       17
       +
           rev = version;

     

       18
       18
       +
           sha256 = "sha256-Y1J0nCVEmGKgQP+GEtPqK8l3SRuls5yesvJuowLDzUo=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ makeWrapper pkg-config ];

     

       22
       22
        
         buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ];

     

       23
       23
        
       

     

       24
       24
       -
         cargoSha256 = "sha256-zSt6iNZ9hmvAgFEXzqfovRsMryVyFWHm68G7J3SMztY=";

     

       24
       24
       +
         cargoSha256 = "sha256-8/vzJXZjSQmefHMo5BXKTRiLy2F3wfIn8VgPMJxtIvY=";

     

       25
       25
        
       

     

       26
       26
        
         postInstall = lib.optionalString (bins != [])  ''

     

       27
       27
        
           wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}"

+2 -2

pkgs/applications/window-managers/i3/default.nix

···

       1
       1
        
       { fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms

     

       2
       2
        
       , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev

     

       3
       3
        
       , yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon

     

       4
       4
       -
       , xorgserver, xvfb_run }:

     

       4
       4
       +
       , xorgserver, xvfb-run }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         pname = "i3";

     
···

       19
       19
        
           libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango

     

       20
       20
        
           perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun

     

       21
       21
        
           perlPackages.ExtUtilsPkgConfig perlPackages.InlineC

     

       22
       22
       -
           xorgserver xvfb_run

     

       22
       22
       +
           xorgserver xvfb-run

     

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
        
         configureFlags = [ "--disable-builddir" ];

+2 -2

pkgs/applications/window-managers/phosh/default.nix

···

       18
       18
        
       , upower

     

       19
       19
        
       , wayland

     

       20
       20
        
       , dbus

     

       21
       21
       -
       , xvfb_run

     

       21
       21
       +
       , xvfb-run

     

       22
       22
        
       , phoc

     

       23
       23
        
       , feedbackd

     

       24
       24
        
       , networkmanager

     
···

       98
       98
        
       

     

       99
       99
        
         checkInputs = [

     

       100
       100
        
           dbus

     

       101
       101
       -
           xvfb_run

     

       101
       101
       +
           xvfb-run

     

       102
       102
        
         ];

     

       103
       103
        
       

     

       104
       104
        
         # Temporarily disabled - Test is broken (SIGABRT)

+2 -2

pkgs/desktops/cinnamon/cjs/default.nix

···

       20
       20
        
       , meson

     

       21
       21
        
       , sysprof

     

       22
       22
        
       , dbus

     

       23
       23
       -
       , xvfb_run

     

       23
       23
       +
       , xvfb-run

     

       24
       24
        
       , ninja

     

       25
       25
        
       , makeWrapper

     

       26
       26
        
       , which

     
···

       58
       58
        
         ];

     

       59
       59
        
       

     

       60
       60
        
         checkInputs = [

     

       61
       61
       -
           xvfb_run

     

       61
       61
       +
           xvfb-run

     

       62
       62
        
         ];

     

       63
       63
        
       

     

       64
       64
        
         propagatedBuildInputs = [

+2 -2

pkgs/desktops/gnome/core/totem/default.nix

···

       25
       25
        
       , gnome-desktop

     

       26
       26
        
       , gsettings-desktop-schemas

     

       27
       27
        
       , gdk-pixbuf

     

       28
       28
       -
       , xvfb_run

     

       28
       28
       +
       , xvfb-run

     

       29
       29
        
       }:

     

       30
       30
        
       

     

       31
       31
        
       stdenv.mkDerivation rec {

     
···

       76
       76
        
         ];

     

       77
       77
        
       

     

       78
       78
        
         checkInputs = [

     

       79
       79
       -
           xvfb_run

     

       79
       79
       +
           xvfb-run

     

       80
       80
        
         ];

     

       81
       81
        
       

     

       82
       82
        
         mesonFlags = [

+2 -2

pkgs/desktops/gnome/misc/geary/default.nix

···

       29
       29
        
       , python3

     

       30
       30
        
       , gnutls

     

       31
       31
        
       , cacert

     

       32
       32
       -
       , xvfb_run

     

       32
       32
       +
       , xvfb-run

     

       33
       33
        
       , glibcLocales

     

       34
       34
        
       , dbus

     

       35
       35
        
       , shared-mime-info

     
···

       99
       99
        
           dbus

     

       100
       100
        
           gnutls # for certtool

     

       101
       101
        
           cacert # trust store for glib-networking

     

       102
       102
       -
           xvfb_run

     

       102
       102
       +
           xvfb-run

     

       103
       103
        
           glibcLocales # required by Geary.ImapDb.DatabaseTest/utf8_case_insensitive_collation

     

       104
       104
        
         ];

     

       105
       105

+2

pkgs/development/haskell-modules/configuration-common.nix

···

       1899
       1899
        
         # https://github.com/travitch/haggle/issues/4

     

       1900
       1900
        
         haggle = doJailbreak super.haggle;

     

       1901
       1901
        
       

     

       1902
       1902
       +
         phonetic-languages-phonetics-basics = appendPatch super.phonetic-languages-phonetics-basics ./patches/phonetic-languages-phonetics-basics-haddock.patch;

     

       1903
       1903
       +
       

     

       1902
       1904
        
       } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

+46

pkgs/development/haskell-modules/patches/phonetic-languages-phonetics-basics-haddock.patch

···

       1
       1
       +
       diff -ru phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs

     

       2
       2
       +
       --- phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs	2021-04-30 17:45:52.000000000 +0200

     

       3
       3
       +
       +++ phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs	2021-05-08 18:16:15.054951952 +0200

     

       4
       4
       +
       @@ -1,11 +1,11 @@

     

       5
       5
       +
       --- |

     

       6
       6
       +
       --- Module      :  Data.Phonetic.Languages.SpecificationsRead

     

       7
       7
       +
       --- Copyright   :  (c) OleksandrZhabenko 2021

     

       8
       8
       +
       --- License     :  MIT

     

       9
       9
       +
       --- Stability   :  Experimental

     

       10
       10
       +
       --- Maintainer  :  olexandr543@yahoo.com

     

       11
       11
       +
       ---

     

       12
       12
       +
       -{-| Provides functions to read data specifications for other modules from textual files.

     

       13
       13
       +
       +{-|

     

       14
       14
       +
       +Module      :  Data.Phonetic.Languages.SpecificationsRead

     

       15
       15
       +
       +Copyright   :  (c) OleksandrZhabenko 2021

     

       16
       16
       +
       +License     :  MIT

     

       17
       17
       +
       +Stability   :  Experimental

     

       18
       18
       +
       +Maintainer  :  olexandr543@yahoo.com

     

       19
       19
       +
       +

     

       20
       20
       +
       +Provides functions to read data specifications for other modules from textual files.

     

       21
       21
       +
        -}

     

       22
       22
       +
        

     

       23
       23
       +
        module Data.Phonetic.Languages.SpecificationsRead where

     

       24
       24
       +
       diff -ru phonetic-languages-phonetics-basics-0.5.1.0/Main.hs phonetic-languages-phonetics-basics-0.5.1.0/Main.hs

     

       25
       25
       +
       --- phonetic-languages-phonetics-basics-0.5.1.0/Main.hs	2021-04-30 17:45:52.000000000 +0200

     

       26
       26
       +
       +++ phonetic-languages-phonetics-basics-0.5.1.0/Main.hs	2021-05-08 18:14:06.344145599 +0200

     

       27
       27
       +
       @@ -1,11 +1,11 @@

     

       28
       28
       +
       --- |

     

       29
       29
       +
       --- Module      :  Main

     

       30
       30
       +
       --- Copyright   :  (c) OleksandrZhabenko 2020-2021

     

       31
       31
       +
       --- License     :  MIT

     

       32
       32
       +
       --- Stability   :  Experimental

     

       33
       33
       +
       --- Maintainer  :  olexandr543@yahoo.com

     

       34
       34
       +
       ---

     

       35
       35
       +
       -{-| Can be used to calculate the durations of the approximations of the phonemes

     

       36
       36
       +
       +{-|

     

       37
       37
       +
       +Module      :  Main

     

       38
       38
       +
       +Copyright   :  (c) OleksandrZhabenko 2020-2021

     

       39
       39
       +
       +License     :  MIT

     

       40
       40
       +
       +Stability   :  Experimental

     

       41
       41
       +
       +Maintainer  :  olexandr543@yahoo.com

     

       42
       42
       +
       +

     

       43
       43
       +
       +Can be used to calculate the durations of the approximations of the phonemes

     

       44
       44
       +
        using some prepared text with its correct (at least mostly) pronunciation.

     

       45
       45
       +
        The prepared text is located in the same directory and contains lines -the

     

       46
       46
       +
        phonetic language word and its duration in seconds separated with whitespace.

+5 -2

pkgs/development/idris-modules/sdl2.nix

···

       12
       12
        
       

     

       13
       13
        
         idrisDeps = [ effects ];

     

       14
       14
        
       

     

       15
       15
       +
         nativeBuildInputs = [

     

       16
       16
       +
           pkg-config

     

       17
       17
       +
         ];

     

       18
       18
       +
       

     

       15
       19
        
         extraBuildInputs = [

     

       16
       16
       -
           pkg-config

     

       17
       20
        
           SDL2

     

       18
       21
        
           SDL2_gfx

     

       19
       22
        
         ];

     
···

       24
       27
        
           owner = "steshaw";

     

       25
       28
        
           repo = "idris-sdl2";

     

       26
       29
        
           rev = version;

     

       27
       27
       -
           sha256 = "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv";

     

       30
       30
       +
           sha256 = "1jslnlzyw04dcvcd7xsdjqa7waxzkm5znddv76sv291jc94xhl4a";

     

       28
       31
        
         };

     

       29
       32
        
       

     

       30
       33
        
         meta = {

+5 -1

pkgs/development/interpreters/falcon/default.nix

···

       11
       11
        
           sha256 = "1x3gdcz1gqhi060ngqi0ghryf69v8bn50yrbzfad8bhblvhzzdlf";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       +
         # -Wnarrowing is enabled by default in recent GCC versions,

     

       15
       15
       +
         # causing compilation to fail.

     

       16
       16
       +
         NIX_CFLAGS_COMPILE = "-Wno-narrowing";

     

       17
       17
       +
       

     

       14
       18
        
         nativeBuildInputs = [ cmake pkg-config ];

     

       15
       19
        
         buildInputs = [ pcre zlib sqlite ];

     

       16
       20
        
       

     

       17
       21
        
         meta = with lib; {

     

       18
       22
        
           description = "Programming language with macros and syntax at once";

     

       19
       19
       -
           license = licenses.gpl2;

     

       23
       23
       +
           license = licenses.gpl2Only;

     

       20
       24
        
           maintainers = with maintainers; [ pSub ];

     

       21
       25
        
           platforms = with platforms; linux;

     

       22
       26
        
         };

+2 -2

pkgs/development/libraries/amtk/default.nix

···

       7
       7
        
       , gobject-introspection

     

       8
       8
        
       , gnome

     

       9
       9
        
       , dbus

     

       10
       10
       -
       , xvfb_run

     

       10
       10
       +
       , xvfb-run

     

       11
       11
        
       }:

     

       12
       12
        
       

     

       13
       13
        
       stdenv.mkDerivation rec {

     
···

       34
       34
        
         doCheck = stdenv.isLinux;

     

       35
       35
        
         checkPhase = ''

     

       36
       36
        
           export NO_AT_BRIDGE=1

     

       37
       37
       -
           ${xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \

     

       37
       37
       +
           ${xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \

     

       38
       38
        
             --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       39
       39
        
             meson test --print-errorlogs

     

       40
       40
        
         '';

+2 -2

pkgs/development/libraries/gjs/default.nix

···

       19
       19
        
       , harfbuzz

     

       20
       20
        
       , makeWrapper

     

       21
       21
        
       , which

     

       22
       22
       -
       , xvfb_run

     

       22
       22
       +
       , xvfb-run

     

       23
       23
        
       , nixosTests

     

       24
       24
        
       }:

     

       25
       25
        
       

     
···

       65
       65
        
         ];

     

       66
       66
        
       

     

       67
       67
        
         checkInputs = [

     

       68
       68
       -
           xvfb_run

     

       68
       68
       +
           xvfb-run

     

       69
       69
        
         ] ++ testDeps;

     

       70
       70
        
       

     

       71
       71
        
         propagatedBuildInputs = [

+2 -2

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

···

       12
       12
        
       , epoxy

     

       13
       13
        
       , gnome

     

       14
       14
        
       , makeFontsConf

     

       15
       15
       -
       , xvfb_run

     

       15
       15
       +
       , xvfb-run

     

       16
       16
        
       }:

     

       17
       17
        
       

     

       18
       18
        
       stdenv.mkDerivation rec {

     
···

       45
       45
        
         ];

     

       46
       46
        
       

     

       47
       47
        
         checkInputs = [

     

       48
       48
       -
           xvfb_run

     

       48
       48
       +
           xvfb-run

     

       49
       49
        
         ];

     

       50
       50
        
       

     

       51
       51
        
         # Tests require fontconfig.

+2 -2

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

···

       1
       1
        
       { lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala

     

       2
       2
       -
       , libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb_run, shared-mime-info }:

     

       2
       2
       +
       , libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb-run, shared-mime-info }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "gtksourceview";

     
···

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [ pkg-config intltool perl gobject-introspection vala ];

     

       23
       23
        
       

     

       24
       24
       -
         checkInputs = [ xvfb_run dbus ];

     

       24
       24
       +
         checkInputs = [ xvfb-run dbus ];

     

       25
       25
        
       

     

       26
       26
        
         buildInputs = [ atk cairo glib pango libxml2 gettext ];

     

       27
       27

+2 -2

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

···

       18
       18
        
       , gnome

     

       19
       19
        
       , gobject-introspection

     

       20
       20
        
       , dbus

     

       21
       21
       -
       , xvfb_run

     

       21
       21
       +
       , xvfb-run

     

       22
       22
        
       , shared-mime-info

     

       23
       23
        
       }:

     

       24
       24
        
       

     
···

       74
       74
        
         ];

     

       75
       75
        
       

     

       76
       76
        
         checkInputs = [

     

       77
       77
       -
           xvfb_run

     

       77
       77
       +
           xvfb-run

     

       78
       78
        
           dbus

     

       79
       79
        
         ];

     

       80
       80

+2 -2

pkgs/development/libraries/gtksourceview/5.x.nix

···

       16
       16
        
       , gnome

     

       17
       17
        
       , gobject-introspection

     

       18
       18
        
       , dbus

     

       19
       19
       -
       , xvfb_run

     

       19
       19
       +
       , xvfb-run

     

       20
       20
        
       , shared-mime-info

     

       21
       21
        
       }:

     

       22
       22
        
       

     
···

       64
       64
        
         ];

     

       65
       65
        
       

     

       66
       66
        
         checkInputs = [

     

       67
       67
       -
           xvfb_run

     

       67
       67
       +
           xvfb-run

     

       68
       68
        
           dbus

     

       69
       69
        
         ];

     

       70
       70

+2 -2

pkgs/development/libraries/libadwaita/default.nix

···

       10
       10
        
       , vala

     

       11
       11
        
       , gobject-introspection

     

       12
       12
        
       , gtk4

     

       13
       13
       -
       , xvfb_run

     

       13
       13
       +
       , xvfb-run

     

       14
       14
        
       }:

     

       15
       15
        
       

     

       16
       16
        
       stdenv.mkDerivation rec {

     
···

       48
       48
        
         ];

     

       49
       49
        
       

     

       50
       50
        
         checkInputs = [

     

       51
       51
       -
           xvfb_run

     

       51
       51
       +
           xvfb-run

     

       52
       52
        
         ];

     

       53
       53
        
       

     

       54
       54
        
         doCheck = true;

+2 -2

pkgs/development/libraries/libdazzle/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2

     

       2
       2
       -
       , gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb_run, glib, gtk3, gnome }:

     

       2
       2
       +
       , gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb-run, glib, gtk3, gnome }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "libdazzle";

     
···

       13
       13
        
           sha256 = "19abrrjsyjhhl1xflnb0likb9wwzz78fa1mk2b064rpscmz9mafv";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ];

     

       16
       16
       +
         nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb-run glib ];

     

       17
       17
        
         buildInputs = [ glib gtk3 ];

     

       18
       18
        
       

     

       19
       19
        
         mesonFlags = [

+2 -2

pkgs/development/libraries/libhandy/0.x.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala

     

       2
       2
        
       , gtk-doc, docbook_xsl, docbook_xml_dtd_43

     

       3
       3
        
       , gtk3, gnome

     

       4
       4
       -
       , dbus, xvfb_run, libxml2

     

       4
       4
       +
       , dbus, xvfb-run, libxml2

     

       5
       5
        
       , hicolor-icon-theme

     

       6
       6
        
       }:

     

       7
       7
        
       

     
···

       25
       25
        
           gtk-doc docbook_xsl docbook_xml_dtd_43

     

       26
       26
        
         ];

     

       27
       27
        
         buildInputs = [ gnome.gnome-desktop gtk3 libxml2 ];

     

       28
       28
       -
         checkInputs = [ dbus xvfb_run hicolor-icon-theme ];

     

       28
       28
       +
         checkInputs = [ dbus xvfb-run hicolor-icon-theme ];

     

       29
       29
        
       

     

       30
       30
        
         mesonFlags = [

     

       31
       31
        
           "-Dgtk_doc=true"

+2 -2

pkgs/development/libraries/libhandy/default.nix

···

       13
       13
        
       , enableGlade ? false

     

       14
       14
        
       , glade

     

       15
       15
        
       , dbus

     

       16
       16
       -
       , xvfb_run

     

       16
       16
       +
       , xvfb-run

     

       17
       17
        
       , libxml2

     

       18
       18
        
       , gdk-pixbuf

     

       19
       19
        
       , librsvg

     
···

       65
       65
        
       

     

       66
       66
        
         checkInputs = [

     

       67
       67
        
           dbus

     

       68
       68
       -
           xvfb_run

     

       68
       68
       +
           xvfb-run

     

       69
       69
        
           at-spi2-atk

     

       70
       70
        
           at-spi2-core

     

       71
       71
        
           librsvg

+2 -2

pkgs/development/libraries/libsecret/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3

     

       2
       2
        
       , docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala

     

       3
       3
       -
       , gtk-doc, gnome, gjs, libintl, dbus, xvfb_run }:

     

       3
       3
       +
       , gtk-doc, gnome, gjs, libintl, dbus, xvfb-run }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "libsecret";

     
···

       32
       32
        
         enableParallelBuilding = true;

     

       33
       33
        
       

     

       34
       34
        
         installCheckInputs = [

     

       35
       35
       -
           python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb_run dbus gjs

     

       35
       35
       +
           python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb-run dbus gjs

     

       36
       36
        
         ];

     

       37
       37
        
       

     

       38
       38
        
         # needs to run after install because typelibs point to absolute paths

+3 -10

pkgs/development/libraries/xine-lib/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
        
       , fetchurl

     

       4
       4
       -
       , fetchpatch

     

       5
       4
        
       , aalib

     

       6
       5
        
       , alsaLib

     

       7
       6
        
       , ffmpeg

     
···

       16
       15
        
       , libtheora

     

       17
       16
        
       , libv4l

     

       18
       17
        
       , libvorbis

     

       18
       18
       +
       , ncurses

     

       19
       19
        
       , perl

     

       20
       20
        
       , pkg-config

     

       21
       21
        
       , speex

     
···

       52
       52
        
           libtheora

     

       53
       53
        
           libv4l

     

       54
       54
        
           libvorbis

     

       55
       55
       +
           ncurses

     

       55
       56
        
           perl

     

       56
       57
        
           speex

     

       57
       58
        
           vcdimager

     
···

       64
       65
        
           libxcb

     

       65
       66
        
         ]);

     

       66
       67
        
       

     

       67
       67
       -
         patches = [

     

       68
       68
       -
           # splitting path plugin

     

       69
       69
       -
           (fetchpatch {

     

       70
       70
       -
             name = "0001-fix-XINE_PLUGIN_PATH-splitting.patch";

     

       71
       71
       -
             url = "https://sourceforge.net/p/xine/mailman/attachment/32394053-5e27-6558-f0c9-49e0da0bc3cc%40gmx.de/1/";

     

       72
       72
       -
             sha256 = "sha256-LJedxrD8JWITDo9pnS9BCmy7wiPTyJyoQ1puX49tOls=";

     

       73
       73
       -
           })

     

       74
       74
       -
         ];

     

       68
       68
       +
         enableParallelBuilding = true;

     

       75
       69
        
       

     

       76
       70
        
         NIX_LDFLAGS = "-lxcb-shm";

     

       77
       71
        
       

     

       78
       78
       -
         enableParallelBuilding = true;

     

       79
       72
        
       

     

       80
       73
        
         meta = with lib; {

     

       81
       74
        
           homepage = "http://www.xinehq.de/";

+37

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , numpy

     

       5
       5
       +
       , scipy

     

       6
       6
       +
       , pymatgen

     

       7
       7
       +
       , pytestCheckHook

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       buildPythonPackage rec {

     

       11
       11
       +
         pname = "castepxbin";

     

       12
       12
       +
         version = "0.1.0";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "zhubonan";

     

       16
       16
       +
           repo = "castepxbin";

     

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

     

       18
       18
       +
           sha256 = "16wnd1mwhl204d1s3har2fhyhyjg86sypg00bj812dxk8zixxszf";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         propagatedBuildInputs = [

     

       22
       22
       +
           numpy

     

       23
       23
       +
           scipy

     

       24
       24
       +
           pymatgen

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         checkInputs = [

     

       28
       28
       +
           pytestCheckHook

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         meta = with lib; {

     

       32
       32
       +
           description = "A collection of readers for CASTEP binary outputs";

     

       33
       33
       +
           homepage = "https://github.com/zhubonan/castepxbin";

     

       34
       34
       +
           license = licenses.mit;

     

       35
       35
       +
           maintainers = with maintainers; [ dotlambda ];

     

       36
       36
       +
         };

     

       37
       37
       +
       }

-38

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

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       4
       4
       -
       , chardet

     

       5
       5
       -
       , attrs

     

       6
       6
       -
       , pytestCheckHook

     

       7
       7
       -
       }:

     

       8
       8
       -
       buildPythonPackage rec {

     

       9
       9
       -
         pname = "debut";

     

       10
       10
       -
         version = "0.9.9";

     

       11
       11
       -
       

     

       12
       12
       -
         src = fetchPypi {

     

       13
       13
       -
           inherit pname version;

     

       14
       14
       -
           sha256 = "a3a71e475295f4cf4292440c9c7303ebca0309d395536d2a7f86a5f4d7465dc1";

     

       15
       15
       -
         };

     

       16
       16
       -
       

     

       17
       17
       -
         dontConfigure = true;

     

       18
       18
       -
       

     

       19
       19
       -
         propagatedBuildInputs = [

     

       20
       20
       -
           chardet

     

       21
       21
       -
           attrs

     

       22
       22
       -
         ];

     

       23
       23
       -
       

     

       24
       24
       -
         checkInputs = [

     

       25
       25
       -
           pytestCheckHook

     

       26
       26
       -
         ];

     

       27
       27
       -
       

     

       28
       28
       -
         pythonImportsCheck = [

     

       29
       29
       -
           "debut"

     

       30
       30
       -
         ];

     

       31
       31
       -
       

     

       32
       32
       -
         meta = with lib; {

     

       33
       33
       -
           description = "Python library to parse Debian deb822-style control and copyright files ";

     

       34
       34
       -
           homepage = "https://github.com/nexB/debut";

     

       35
       35
       -
           license = with licenses; [ asl20 bsd3 mit ];

     

       36
       36
       -
           maintainers = teams.determinatesystems.members;

     

       37
       37
       -
         };

     

       38
       38
       -
       }

+2 -2

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

···

       10
       10
        
       , gsettings-desktop-schemas

     

       11
       11
        
       , fetchurl

     

       12
       12
        
       , dbus

     

       13
       13
       -
       , xvfb_run

     

       13
       13
       +
       , xvfb-run

     

       14
       14
        
       , wrapGAppsHook

     

       15
       15
        
       # , fetchPypi

     

       16
       16
        
       }:

     
···

       33
       33
        
           ./nix-support.patch

     

       34
       34
        
         ];

     

       35
       35
        
       

     

       36
       36
       -
         nativeBuildInputs = [ gobject-introspection dbus xvfb_run wrapGAppsHook ]; # for setup hooks

     

       36
       36
       +
         nativeBuildInputs = [ gobject-introspection dbus xvfb-run wrapGAppsHook ]; # for setup hooks

     

       37
       37
        
         propagatedBuildInputs = [ at-spi2-core gtk3 pygobject3 pyatspi pycairo ];

     

       38
       38
        
         strictDeps = false; # issue 56943

     

       39
       39

+2 -2

pkgs/development/python-modules/drf-nested-routers/default.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "drf-nested-routers";

     

       16
       16
       -
         version = "0.92.5";

     

       16
       16
       +
         version = "0.93.3";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "alanjds";

     

       20
       20
        
           repo = "drf-nested-routers";

     

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

     

       22
       22
       -
           sha256 = "1l1jza8xz6xcm3gwxh1k6pc8fs95cq3v751gxj497y1a83d26j8i";

     

       22
       22
       +
           sha256 = "1gmw6gwiqzfysx8qn7aan7xgkizxy64db94z30pm3bvn6jxv08si";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [ django djangorestframework setuptools ];

+16 -8

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

···

       1
       1
       -
       { lib, stdenv, libusb1, udev, darwin, fetchPypi, buildPythonPackage, cython }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , buildPythonPackage

     

       4
       4
       +
       , fetchPypi

     

       5
       5
       +
       , xcbuild

     

       6
       6
       +
       , cython

     

       7
       7
       +
       , libusb1

     

       8
       8
       +
       , udev

     

       9
       9
       +
       , darwin

     

       10
       10
       +
       }:

     

       2
       11
        
       

     

       3
       12
        
       buildPythonPackage rec {

     

       4
       13
        
         pname = "hidapi";

     
···

       9
       18
        
           sha256 = "a1170b18050bc57fae3840a51084e8252fd319c0fc6043d68c8501deb0e25846";

     

       10
       19
        
         };

     

       11
       20
        
       

     

       12
       12
       -
         propagatedBuildInputs =

     

       13
       13
       -
           lib.optionals stdenv.isLinux [ libusb1 udev ] ++

     

       14
       14
       -
           lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit ]) ++

     

       15
       15
       -
           [ cython ];

     

       21
       21
       +
         nativeBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ];

     

       22
       22
       +
       

     

       23
       23
       +
         propagatedBuildInputs = [ cython ]

     

       24
       24
       +
           ++ lib.optionals stdenv.isLinux [ libusb1 udev ]

     

       25
       25
       +
           ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit ]);

     

       16
       26
        
       

     

       17
       27
        
         # Fix the USB backend library lookup

     

       18
       28
        
         postPatch = lib.optionalString stdenv.isLinux ''

     

       19
       29
        
           libusb=${libusb1.dev}/include/libusb-1.0

     

       20
       30
        
           test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }

     

       21
       31
        
           sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py

     

       22
       22
       -
         '' + lib.optionalString stdenv.isDarwin ''

     

       23
       23
       -
           substituteInPlace setup.py --replace 'macos_sdk_path =' 'macos_sdk_path = "" #'

     

       24
       32
        
         '';

     

       25
       33
        
       

     

       26
       34
        
         pythonImportsCheck = [ "hid" ];

     
···

       30
       38
        
           homepage = "https://github.com/trezor/cython-hidapi";

     

       31
       39
        
           # license can actually be either bsd3 or gpl3

     

       32
       40
        
           # see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt

     

       33
       33
       -
           license = licenses.bsd3;

     

       41
       41
       +
           license = with licenses; [ bsd3 gpl3Only ];

     

       34
       42
        
           maintainers = with maintainers; [ np prusnak ];

     

       35
       43
        
         };

     

       36
       44
        
       }

+2 -2

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

···

       3
       3
        
       , buildPythonPackage

     

       4
       4
        
       , python

     

       5
       5
        
       , pygobject3

     

       6
       6
       -
       , xvfb_run

     

       6
       6
       +
       , xvfb-run

     

       7
       7
        
       , gobject-introspection

     

       8
       8
        
       , gtk3

     

       9
       9
        
       , pythonOlder

     
···

       32
       32
        
       

     

       33
       33
        
         checkPhase = ''

     

       34
       34
        
           runHook preCheck

     

       35
       35
       -
           ${xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \

     

       35
       35
       +
           ${xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \

     

       36
       36
        
             ${python.interpreter} nix_run_setup test

     

       37
       37
        
           runHook postCheck

     

       38
       38
        
         '';

+44

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pytestCheckHook

     

       5
       5
       +
       , typer

     

       6
       6
       +
       , dataclasses

     

       7
       7
       +
       , smart_open

     

       8
       8
       +
       , pytest

     

       9
       9
       +
       , mock

     

       10
       10
       +
       , google-cloud-storage

     

       11
       11
       +
       }:

     

       12
       12
       +
       

     

       13
       13
       +
       buildPythonPackage rec {

     

       14
       14
       +
         pname = "pathy";

     

       15
       15
       +
         version = "0.5.2";

     

       16
       16
       +
       

     

       17
       17
       +
         src = fetchPypi {

     

       18
       18
       +
           inherit pname version;

     

       19
       19
       +
           sha256 = "sha256-nb8my/5rkc7thuHnXZHe1Hg8j+sLBlYyJcLHWrrKZ5M=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         propagatedBuildInputs = [ smart_open typer google-cloud-storage ];

     

       23
       23
       +
       

     

       24
       24
       +
         postPatch = ''

     

       25
       25
       +
           substituteInPlace requirements.txt \

     

       26
       26
       +
             --replace "smart-open>=2.2.0,<4.0.0" "smart-open>=2.2.0"

     

       27
       27
       +
         '';

     

       28
       28
       +
       

     

       29
       29
       +
         checkInputs = [ pytestCheckHook mock ];

     

       30
       30
       +
       

     

       31
       31
       +
         # Exclude tests that require provider credentials

     

       32
       32
       +
         pytestFlagsArray = [

     

       33
       33
       +
           "--ignore=pathy/_tests/test_clients.py"

     

       34
       34
       +
           "--ignore=pathy/_tests/test_gcs.py"

     

       35
       35
       +
           "--ignore=pathy/_tests/test_s3.py"

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         meta = with lib; {

     

       39
       39
       +
           description = "A Path interface for local and cloud bucket storage";

     

       40
       40
       +
           homepage = "https://github.com/justindujardin/pathy";

     

       41
       41
       +
           license = licenses.asl20;

     

       42
       42
       +
           maintainers = with maintainers; [ melling ];

     

       43
       43
       +
         };

     

       44
       44
       +
       }

+7 -2

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

···

       1
       1
        
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , fetchPypi

     

       3
       4
        
       , buildPythonPackage

     

       4
       5
        
       , Mako

     
···

       12
       13
        
       , opencl-headers

     

       13
       14
        
       , ocl-icd

     

       14
       15
        
       , pybind11

     

       16
       16
       +
       , mesa_drivers

     

       15
       17
        
       }:

     

       16
       18
        
       

     

       17
       17
       -
       buildPythonPackage rec {

     

       19
       19
       +
       let

     

       20
       20
       +
         os-specific-buildInputs =

     

       21
       21
       +
           if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ];

     

       22
       22
       +
       in buildPythonPackage rec {

     

       18
       23
        
         pname = "pyopencl";

     

       19
       24
        
         version = "2021.1.4";

     

       20
       25
        
       

     

       21
       26
        
         checkInputs = [ pytest ];

     

       22
       22
       -
         buildInputs = [ opencl-headers ocl-icd pybind11 ];

     

       27
       27
       +
         buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs;

     

       23
       28
        
       

     

       24
       29
        
         propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ];

     

       25
       30

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchFromGitHub

     

       2
       2
       -
       , pillow, xlib, six, xvfb_run, sphinx }:

     

       2
       2
       +
       , pillow, xlib, six, xvfb-run, sphinx }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "pystray";

     
···

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ sphinx ];

     

       16
       16
        
         propagatedBuildInputs = [ pillow xlib six ];

     

       17
       17
       -
         checkInputs = [ xvfb_run ];

     

       17
       17
       +
         checkInputs = [ xvfb-run ];

     

       18
       18
        
       

     

       19
       19
        
         checkPhase = ''

     

       20
       20
        
           rm tests/icon_tests.py # test needs user input

+2 -2

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

···

       6
       6
        
       , pytest

     

       7
       7
        
       , pythonOlder

     

       8
       8
        
       , qt5

     

       9
       9
       -
       , xvfb_run

     

       9
       9
       +
       , xvfb-run

     

       10
       10
        
       }:

     

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     
···

       31
       31
        
       

     

       32
       32
        
         checkInputs = [

     

       33
       33
        
           pytest

     

       34
       34
       -
           xvfb_run

     

       34
       34
       +
           xvfb-run

     

       35
       35
        
         ];

     

       36
       36
        
       

     

       37
       37
        
         checkPhase = ''

+12 -1

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

···

       7
       7
        
       , blis

     

       8
       8
        
       , catalogue

     

       9
       9
        
       , cymem

     

       10
       10
       +
       , jinja2

     

       10
       11
        
       , jsonschema

     

       11
       12
        
       , murmurhash

     

       12
       13
        
       , numpy

     
···

       16
       17
        
       , requests

     

       17
       18
        
       , setuptools

     

       18
       19
        
       , srsly

     

       20
       20
       +
       , spacy-legacy

     

       19
       21
        
       , thinc

     

       20
       22
        
       , wasabi

     

       23
       23
       +
       , packaging

     

       24
       24
       +
       , pathy

     

       25
       25
       +
       , pydantic

     

       21
       26
        
       }:

     

       22
       27
        
       

     

       23
       28
        
       buildPythonPackage rec {

     
···

       33
       38
        
           blis

     

       34
       39
        
           catalogue

     

       35
       40
        
           cymem

     

       41
       41
       +
           jinja2

     

       36
       42
        
           jsonschema

     

       37
       43
        
           murmurhash

     

       38
       44
        
           numpy

     
···

       41
       47
        
           requests

     

       42
       48
        
           setuptools

     

       43
       49
        
           srsly

     

       50
       50
       +
           spacy-legacy

     

       44
       51
        
           thinc

     

       45
       52
        
           wasabi

     

       53
       53
       +
           packaging

     

       54
       54
       +
           pathy

     

       55
       55
       +
           pydantic

     

       46
       56
        
         ] ++ lib.optional (pythonOlder "3.4") pathlib;

     

       47
       57
        
       

     

       48
       58
        
         checkInputs = [

     
···

       60
       70
        
             --replace "catalogue>=0.0.7,<1.1.0" "catalogue>=0.0.7,<3.0" \

     

       61
       71
        
             --replace "plac>=0.9.6,<1.2.0" "plac>=0.9.6,<2.0" \

     

       62
       72
        
             --replace "srsly>=1.0.2,<1.1.0" "srsly>=1.0.2,<3.0" \

     

       63
       63
       -
             --replace "thinc>=7.4.1,<7.5.0" "thinc>=7.4.1,<8"

     

       73
       73
       +
             --replace "thinc>=7.4.1,<7.5.0" "thinc>=7.4.1,<8" \

     

       74
       74
       +
             --replace "pydantic>=1.7.1,<1.8.0" "pydantic>=1.7.1,<1.8.3"

     

       64
       75
        
         '';

     

       65
       76
        
       

     

       66
       77
        
         pythonImportsCheck = [ "spacy" ];

+26

pkgs/development/python-modules/spacy/legacy.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , fetchPypi

     

       3
       3
       +
       , buildPythonPackage

     

       4
       4
       +
       , pytestCheckHook

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       buildPythonPackage rec {

     

       8
       8
       +
         pname = "spacy-legacy";

     

       9
       9
       +
         version = "3.0.5";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchPypi {

     

       12
       12
       +
           inherit pname version;

     

       13
       13
       +
           sha256 = "sha256-Uy94rjFllSj622RTzd6UJaQmIniCw4gpeq/X57QcIpA=";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         # checkInputs = [ pytestCheckHook spacy ];

     

       17
       17
       +
         doCheck = false;

     

       18
       18
       +
         pythonImportsCheck = [ "spacy_legacy" ];

     

       19
       19
       +
       

     

       20
       20
       +
         meta = with lib; {

     

       21
       21
       +
           description = "A Path interface for local and cloud bucket storage";

     

       22
       22
       +
           homepage = "https://github.com/justindujardin/pathy";

     

       23
       23
       +
           license = licenses.asl20;

     

       24
       24
       +
           maintainers = with maintainers; [ melling ];

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+20 -13

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchFromGitHub, isPy27

     

       1
       1
       +
       { lib, buildPythonPackage, fetchFromGitHub

     

       2
       2
       +
       , pythonOlder

     

       2
       3
        
       , h5py

     

       3
       4
        
       , matplotlib

     

       4
       5
        
       , numpy

     

       5
       6
        
       , phonopy

     

       6
       7
        
       , pymatgen

     

       7
       7
       -
       , pytest

     

       8
       8
        
       , scipy

     

       9
       9
        
       , seekpath

     

       10
       10
        
       , spglib

     

       11
       11
       +
       , castepxbin

     

       12
       12
       +
       , pytestCheckHook

     

       11
       13
        
       }:

     

       12
       14
        
       

     

       13
       15
        
       buildPythonPackage rec {

     

       14
       16
        
         pname = "sumo";

     

       15
       15
       -
         version = "2.2.1";

     

       17
       17
       +
         version = "2.2.4";

     

       18
       18
       +
       

     

       19
       19
       +
         disabled = pythonOlder "3.6";

     

       16
       20
        
       

     

       17
       21
        
         # No tests in Pypi tarball

     

       18
       22
        
         src = fetchFromGitHub {

     

       19
       23
        
           owner = "SMTG-UCL";

     

       20
       24
        
           repo = "sumo";

     

       21
       25
        
           rev = "v${version}";

     

       22
       22
       -
           sha256 = "0r88f5w33h9b0mv7shlqc4przwvas5ycgndvl91wqjnm3b2s3ix0";

     

       26
       26
       +
           sha256 = "051353gsxmh4qnabshfnc00mmzdbh1fgk1xdfnsfgcnijxgw25bb";

     

       23
       27
        
         };

     

       24
       28
        
       

     

       25
       25
       -
         propagatedBuildInputs = [ numpy scipy spglib pymatgen h5py matplotlib seekpath phonopy ];

     

       26
       26
       -
       

     

       27
       27
       -
         checkInputs = [ pytest ];

     

       28
       28
       -
       

     

       29
       29
       -
         checkPhase = ''

     

       30
       30
       -
           pytest .

     

       31
       31
       -
         '';

     

       29
       29
       +
         propagatedBuildInputs = [

     

       30
       30
       +
           spglib

     

       31
       31
       +
           numpy

     

       32
       32
       +
           scipy

     

       33
       33
       +
           h5py

     

       34
       34
       +
           pymatgen

     

       35
       35
       +
           phonopy

     

       36
       36
       +
           matplotlib

     

       37
       37
       +
           seekpath

     

       38
       38
       +
           castepxbin

     

       39
       39
       +
         ];

     

       32
       40
        
       

     

       33
       33
       -
         # tests have type annotations, can only run on 3.5+

     

       34
       34
       -
         doCheck = (!isPy27);

     

       41
       41
       +
         checkInputs = [ pytestCheckHook ];

     

       35
       42
        
       

     

       36
       43
        
         meta = with lib; {

     

       37
       44
        
           description = "Toolkit for plotting and analysis of ab initio solid-state calculation data";

+40

pkgs/development/python-modules/tern/0001-Replace-debut-with-debian-inspector.patch

···

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

     

       2
       2
       +
       From: Cole Helbling <cole.e.helbling@outlook.com>

     

       3
       3
       +
       Date: Fri, 7 May 2021 11:00:46 -0700

     

       4
       4
       +
       Subject: [PATCH] Replace `debut` with `debian-inspector`

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        requirements.in        | 2 +-

     

       8
       8
       +
        tern/analyze/common.py | 4 ++--

     

       9
       9
       +
        2 files changed, 3 insertions(+), 3 deletions(-)

     

       10
       10
       +
       

     

       11
       11
       +
       diff --git a/requirements.in b/requirements.in

     

       12
       12
       +
       index edd90ab..5135841 100644

     

       13
       13
       +
       --- a/requirements.in

     

       14
       14
       +
       +++ b/requirements.in

     

       15
       15
       +
       @@ -12,6 +12,6 @@ requests

     

       16
       16
       +
        stevedore

     

       17
       17
       +
        pbr

     

       18
       18
       +
        dockerfile-parse

     

       19
       19
       +
       -debut

     

       20
       20
       +
       +debian-inspector

     

       21
       21
       +
        regex

     

       22
       22
       +
        GitPython

     

       23
       23
       +
       diff --git a/tern/analyze/common.py b/tern/analyze/common.py

     

       24
       24
       +
       index 6962404..0f5e77d 100644

     

       25
       25
       +
       --- a/tern/analyze/common.py

     

       26
       26
       +
       +++ b/tern/analyze/common.py

     

       27
       27
       +
       @@ -19,8 +19,8 @@ from tern.utils import cache

     

       28
       28
       +
        from tern.utils import constants

     

       29
       29
       +
        from tern.utils import general

     

       30
       30
       +
        from tern.utils import rootfs

     

       31
       31
       +
       -from debut import debcon

     

       32
       32
       +
       -from debut import copyright as debut_copyright

     

       33
       33
       +
       +from debian_inspector import debcon

     

       34
       34
       +
       +from debian_inspector import copyright as debut_copyright

     

       35
       35
       +
        

     

       36
       36
       +
        # global logger

     

       37
       37
       +
        logger = logging.getLogger(constants.logger_name)

     

       38
       38
       +
       -- 

     

       39
       39
       +
       2.31.1

     

       40
       40
       +

+10 -2

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

···

       7
       7
        
       , requests

     

       8
       8
        
       , stevedore

     

       9
       9
        
       , pbr

     

       10
       10
       -
       , debut

     

       10
       10
       +
       , debian-inspector

     

       11
       11
        
       , regex

     

       12
       12
        
       , GitPython

     

       13
       13
        
       , prettytable

     
···

       22
       22
        
           sha256 = "606c62944991b2cbcccf3f5353be693305d6d7d318c3865b9ecca49dbeab2727";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       +
         patches = [

     

       26
       26
       +
           # debut was renamed to debian-inspector

     

       27
       27
       +
           # https://github.com/tern-tools/tern/pull/962

     

       28
       28
       +
           # NOTE: Has to be in-tree because the upstream patch doesn't apply cleanly

     

       29
       29
       +
           # to the PyPi source.

     

       30
       30
       +
           ./0001-Replace-debut-with-debian-inspector.patch

     

       31
       31
       +
         ];

     

       32
       32
       +
       

     

       25
       33
        
         preBuild = ''

     

       26
       34
        
           cp requirements.{in,txt}

     

       27
       35
        
         '';

     
···

       36
       44
        
           dockerfile-parse

     

       37
       45
        
           requests

     

       38
       46
        
           stevedore

     

       39
       39
       -
           debut

     

       47
       47
       +
           debian-inspector

     

       40
       48
        
           regex

     

       41
       49
        
           GitPython

     

       42
       50
        
           prettytable

+2 -2

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, isPy3k, python3, xvfb_run

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, isPy3k, python3, xvfb-run

     

       2
       2
        
       , wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gtk3, numpy }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     
···

       13
       13
        
         disabled = !isPy3k;

     

       14
       14
        
         nativeBuildInputs = [ wrapGAppsHook ];

     

       15
       15
        
         propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 numpy ];

     

       16
       16
       -
         checkInputs = [ xvfb_run ];

     

       16
       16
       +
         checkInputs = [ xvfb-run ];

     

       17
       17
        
       

     

       18
       18
        
         checkPhase = ''

     

       19
       19
        
           xvfb-run -s '-screen 0 800x600x24' ${python3.interpreter} nix_run_setup test

+3 -3

pkgs/development/r-modules/generic-builder.nix

···

       1
       1
       -
       { stdenv, lib, R, libcxx, xvfb_run, util-linux, Cocoa, Foundation, gettext, gfortran }:

     

       1
       1
       +
       { stdenv, lib, R, libcxx, xvfb-run, util-linux, Cocoa, Foundation, gettext, gfortran }:

     

       2
       2
        
       

     

       3
       3
        
       { name, buildInputs ? [], requireX ? false, ... } @ attrs:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation ({

     

       6
       6
        
         buildInputs = buildInputs ++ [R gettext] ++

     

       7
       7
       -
                       lib.optionals requireX [util-linux xvfb_run] ++

     

       7
       7
       +
                       lib.optionals requireX [util-linux xvfb-run] ++

     

       8
       8
        
                       lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran];

     

       9
       9
        
       

     

       10
       10
        
         NIX_CFLAGS_COMPILE =

     
···

       29
       29
        
         rCommand = if requireX then

     

       30
       30
        
           # Unfortunately, xvfb-run has a race condition even with -a option, so that

     

       31
       31
        
           # we acquire a lock explicitly.

     

       32
       32
       -
           "flock ${xvfb_run} xvfb-run -a -e xvfb-error R"

     

       32
       32
       +
           "flock ${xvfb-run} xvfb-run -a -e xvfb-error R"

     

       33
       33
        
         else

     

       34
       34
        
           "R";

     

       35
       35

+1

pkgs/games/0ad/data.nix

···

       19
       19
        
           description = "A free, open-source game of ancient warfare -- data files";

     

       20
       20
        
           homepage = "https://play0ad.com/";

     

       21
       21
        
           license = licenses.cc-by-sa-30;

     

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

     

       22
       23
        
           platforms = platforms.linux;

     

       23
       24
        
           hydraPlatforms = [];

     

       24
       25
        
         };

+4 -7

pkgs/games/0ad/game.nix

···

       2
       2
        
       , pkg-config, spidermonkey_78, boost, icu, libxml2, libpng, libsodium

     

       3
       3
        
       , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc

     

       4
       4
        
       , openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2

     

       5
       5
       -
       , gloox, nvidia-texture-tools, zeroad-data

     

       5
       5
       +
       , gloox, nvidia-texture-tools

     

       6
       6
        
       , withEditor ? true, wxGTK

     

       7
       7
        
       }:

     

       8
       8
        
       

     
···

       50
       50
        
           "-I${fmt.dev}/include"

     

       51
       51
        
         ];

     

       52
       52
        
       

     

       53
       53
       +
         patches = [ ./rootdir_env.patch ];

     

       54
       54
       +
       

     

       53
       55
        
         configurePhase = ''

     

       54
       56
        
           # Delete shipped libraries which we don't need.

     

       55
       57
        
           rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey}

     
···

       62
       64
        
             ${lib.optionalString withEditor "--enable-atlas"} \

     

       63
       65
        
             --bindir="$out"/bin \

     

       64
       66
        
             --libdir="$out"/lib/0ad \

     

       65
       65
       -
             --datadir="$out"/share/0ad/data \

     

       66
       67
        
             --without-tests \

     

       67
       68
        
             -j $NIX_BUILD_CORES

     

       68
       69
        
           popd

     
···

       85
       86
        
           # Copy l10n data.

     

       86
       87
        
           install -Dm755 -t $out/share/0ad/data/l10n binaries/data/l10n/*

     

       87
       88
        
       

     

       88
       88
       -
           # Link in game data from package

     

       89
       89
       -
           ln -s ${zeroad-data}/share/0ad/data/config $out/share/0ad/data/config

     

       90
       90
       -
           ln -s ${zeroad-data}/share/0ad/data/mods $out/share/0ad/data/mods

     

       91
       91
       -
           ln -s ${zeroad-data}/share/0ad/data/tools $out/share/0ad/data/tools

     

       92
       92
       -
       

     

       93
       89
        
           # Copy libraries.

     

       94
       90
        
           install -Dm644 -t $out/lib/0ad        binaries/system/*.so

     

       95
       91
        
       

     
···

       105
       101
        
             gpl2 lgpl21 mit cc-by-sa-30

     

       106
       102
        
             licenses.zlib # otherwise masked by pkgs.zlib

     

       107
       103
        
           ];

     

       104
       104
       +
           maintainers = with maintainers; [ chvp ];

     

       108
       105
        
           platforms = subtractLists platforms.i686 platforms.linux;

     

       109
       106
        
         };

     

       110
       107
        
       }

+39

pkgs/games/0ad/rootdir_env.patch

···

       1
       1
       +
       diff --git a/source/ps/GameSetup/Paths.cpp b/source/ps/GameSetup/Paths.cpp

     

       2
       2
       +
       index 474364e..bf084b4 100644

     

       3
       3
       +
       --- a/source/ps/GameSetup/Paths.cpp

     

       4
       4
       +
       +++ b/source/ps/GameSetup/Paths.cpp

     

       5
       5
       +
       @@ -155,32 +155,8 @@ Paths::Paths(const CmdLineArgs& args)

     

       6
       6
       +
        

     

       7
       7
       +
        /*static*/ OsPath Paths::Root(const OsPath& argv0)

     

       8
       8
       +
        {

     

       9
       9
       +
       -#if OS_ANDROID

     

       10
       10
       +
       -	return OsPath("/sdcard/0ad"); // TODO: this is kind of bogus

     

       11
       11
       +
       -#else

     

       12
       12
       +
       -

     

       13
       13
       +
       -	// get full path to executable

     

       14
       14
       +
       -	OsPath pathname = sys_ExecutablePathname();	// safe, but requires OS-specific implementation

     

       15
       15
       +
       -	if(pathname.empty())	// failed, use argv[0] instead

     

       16
       16
       +
       -	{

     

       17
       17
       +
       -		errno = 0;

     

       18
       18
       +
       -		pathname = wrealpath(argv0);

     

       19
       19
       +
       -		if(pathname.empty())

     

       20
       20
       +
       -			WARN_IF_ERR(StatusFromErrno());

     

       21
       21
       +
       -	}

     

       22
       22
       +
       -

     

       23
       23
       +
       -	// make sure it's valid

     

       24
       24
       +
       -	if(!FileExists(pathname))

     

       25
       25
       +
       -	{

     

       26
       26
       +
       -		LOGERROR("Cannot find executable (expected at '%s')", pathname.string8());

     

       27
       27
       +
       -		WARN_IF_ERR(StatusFromErrno());

     

       28
       28
       +
       -	}

     

       29
       29
       +
       -

     

       30
       30
       +
       -	for(size_t i = 0; i < 2; i++)	// remove "system/name.exe"

     

       31
       31
       +
       -		pathname = pathname.Parent();

     

       32
       32
       +
       -	return pathname;

     

       33
       33
       +
       -

     

       34
       34
       +
       -#endif

     

       35
       35
       +
       +        UNUSED2(argv0);

     

       36
       36
       +
       +        return OsPath(getenv("ZEROAD_ROOTDIR"));

     

       37
       37
       +
        }

     

       38
       38
       +
        

     

       39
       39
       +
        /*static*/ OsPath Paths::RootData(const OsPath& argv0)

+3 -3

pkgs/games/alephone/default.nix

···

       7
       7
        
         self = stdenv.mkDerivation rec {

     

       8
       8
        
           outputs = [ "out" "icons" ];

     

       9
       9
        
           pname = "alephone";

     

       10
       10
       -
           version = "1.3.1";

     

       10
       10
       +
           version = "1.4";

     

       11
       11
        
       

     

       12
       12
        
           src = fetchurl {

     

       13
       13
       -
             url = let date = "20200904";

     

       13
       13
       +
             url = let date = "20210408";

     

       14
       14
        
             in "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${date}/AlephOne-${date}.tar.bz2";

     

       15
       15
       -
             sha256 = "13ck3mp9qd5pkiq6zwvr744bwvmnqkgj5vpf325sz1mcvnv7l8lh";

     

       15
       15
       +
             sha256 = "sha256-tMwATUhUpo8W2oSWxGSZcAHVkj1PWEvUR/rpMZwWCWA=";

     

       16
       16
        
           };

     

       17
       17
        
       

     

       18
       18
        
           nativeBuildInputs = [ pkg-config icoutils ];

+10

pkgs/misc/emulators/vbam/default.nix

···

       2
       2
        
       , cairo

     

       3
       3
        
       , cmake

     

       4
       4
        
       , fetchFromGitHub

     

       5
       5
       +
       , fetchpatch

     

       5
       6
        
       , ffmpeg

     

       6
       7
        
       , gettext

     

       7
       8
        
       , libGLU, libGL

     
···

       44
       45
        
           "-DSYSCONFDIR=etc"

     

       45
       46
        
           "-DENABLE_WX='false'"

     

       46
       47
        
           "-DENABLE_SDL='true'"

     

       48
       48
       +
         ];

     

       49
       49
       +
       

     

       50
       50
       +
         patches = [

     

       51
       51
       +
           (fetchpatch {

     

       52
       52
       +
             # https://github.com/visualboyadvance-m/visualboyadvance-m/pull/793

     

       53
       53
       +
             name = "fix-build-SDL-2.0.14.patch";

     

       54
       54
       +
             url = "https://github.com/visualboyadvance-m/visualboyadvance-m/commit/619a5cce683ec4b1d03f08f316ba276d8f8cd824.patch";

     

       55
       55
       +
             sha256 = "099cbzgq4r9g83bvdra8a0swfl1vpfng120wf4q7h6vs0n102rk9";

     

       56
       56
       +
           })

     

       47
       57
        
         ];

     

       48
       58
        
       

     

       49
       59
        
         meta =  with lib; {

+22 -4

pkgs/misc/vscode-extensions/default.nix

···

       1
       1
       -
       { config, lib, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8 }:

     

       1
       1
       +
       { config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8 }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         inherit (vscode-utils) buildVscodeMarketplaceExtension;

     
···

       702
       702
        
       

     

       703
       703
        
             ms-vscode-remote.remote-ssh = callPackage ./remote-ssh {};

     

       704
       704
        
       

     

       705
       705
       -
             ms-python.python = callPackage ./python {

     

       706
       706
       -
               extractNuGet = callPackage ./python/extract-nuget.nix { };

     

       707
       707
       -
             };

     

       705
       705
       +
             ms-python.python = let

     

       706
       706
       +
               raw-package = callPackage ./python {

     

       707
       707
       +
                 extractNuGet = callPackage ./python/extract-nuget.nix { };

     

       708
       708
       +
               };

     

       709
       709
       +
             in

     

       710
       710
       +
               buildEnv {

     

       711
       711
       +
                 name = "vscode-extension-ms-python-python-full";

     

       712
       712
       +
                 paths = [ raw-package self.ms-toolsai.jupyter ];

     

       713
       713
       +
               };

     

       708
       714
        
       

     

       709
       715
        
             msjsdiag.debugger-for-chrome = buildVscodeMarketplaceExtension {

     

       710
       716
        
               mktplcRef = {

     
···

       715
       721
        
               };

     

       716
       722
        
               meta = {

     

       717
       723
        
                 license = lib.licenses.mit;

     

       724
       724
       +
               };

     

       725
       725
       +
             };

     

       726
       726
       +
       

     

       727
       727
       +
             ms-toolsai.jupyter = buildVscodeMarketplaceExtension {

     

       728
       728
       +
               mktplcRef = {

     

       729
       729
       +
                 name = "jupyter";

     

       730
       730
       +
                 publisher = "ms-toolsai";

     

       731
       731
       +
                 version = "2021.5.745244803";

     

       732
       732
       +
                 sha256 = "0gjpsp61l8daqa87mpmxcrvsvb0pc2vwg7xbkvwn0f13c1739w9p";

     

       733
       733
       +
               };

     

       734
       734
       +
               meta = {

     

       735
       735
       +
                 license = lib.licenses.unfree;

     

       718
       736
        
               };

     

       719
       737
        
             };

     

       720
       738

+2 -2

pkgs/misc/vscode-extensions/python/default.nix

···

       41
       41
        
         mktplcRef = {

     

       42
       42
        
           name = "python";

     

       43
       43
        
           publisher = "ms-python";

     

       44
       44
       -
           version = "2020.9.114305";

     

       44
       44
       +
           version = "2021.4.765268190";

     

       45
       45
        
         };

     

       46
       46
        
       

     

       47
       47
        
         vsix = fetchurl {

     

       48
       48
        
           name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";

     

       49
       49
        
           url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix";

     

       50
       50
       -
           sha256 = "1vh0wvfvzszc58lw7dbl60knpm5l6rrsghfchhn5dvwyadx4a33h";

     

       50
       50
       +
           sha256 = "0x7dn3vc83mph2gaxgx26bn7g71hqdpp1mpizmd4jqcrknc4d7ci";

     

       51
       51
        
         };

     

       52
       52
        
       

     

       53
       53
        
         buildInputs = [

+3 -2

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

···

       1
       1
        
       { fetchFromGitHub, lib, stdenv, kernel ? false }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         pname = "cryptodev-linux-1.11";

     

       4
       4
       +
         pname = "cryptodev-linux-1.12";

     

       5
       5
        
         name = "${pname}-${kernel.version}";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "cryptodev-linux";

     

       9
       9
        
           repo = "cryptodev-linux";

     

       10
       10
        
           rev = pname;

     

       11
       11
       -
           sha256 = "1ky850qiyacq8p3lng7n3w6h3x2clqrz4lkv2cv3psy92mg9pvc9";

     

       11
       11
       +
           sha256 = "sha256-vJQ10rG5FGbeEOqCUmH/pZ0P77kAW/MtUarywbtIyHw=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         hardeningDisable = [ "pic" ];

     
···

       20
       20
        
         meta = {

     

       21
       21
        
           description = "Device that allows access to Linux kernel cryptographic drivers";

     

       22
       22
        
           homepage = "http://cryptodev-linux.org/";

     

       23
       23
       +
           maintainers = with lib.maintainers; [ fortuneteller2k ];

     

       23
       24
        
           license = lib.licenses.gpl2Plus;

     

       24
       25
        
           platforms = lib.platforms.linux;

     

       25
       26
        
         };

+2

pkgs/servers/clickhouse/default.nix

···

       9
       9
        
         pname = "clickhouse";

     

       10
       10
        
         version = "20.11.4.13";

     

       11
       11
        
       

     

       12
       12
       +
         broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685

     

       13
       13
       +
       

     

       12
       14
        
         src = fetchFromGitHub {

     

       13
       15
        
           owner  = "ClickHouse";

     

       14
       16
        
           repo   = "ClickHouse";

+2 -2

pkgs/servers/matrix-synapse/default.nix

···

       12
       12
        
       in

     

       13
       13
        
       buildPythonApplication rec {

     

       14
       14
        
         pname = "matrix-synapse";

     

       15
       15
       -
         version = "1.32.2";

     

       15
       15
       +
         version = "1.33.1";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "sha256-Biwj/zORBsU8XvpMMlSjR3Nqx0q1LqaSX/vX+UDeXI8=";

     

       19
       19
       +
           sha256 = "sha256-kH5HhkfUL+WzcX/0pK0dV1bI34TpmgRpx3m/UchdAEE=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         patches = [

+3 -3

pkgs/servers/plex/raw.nix

···

       12
       12
        
       # server, and the FHS userenv and corresponding NixOS module should

     

       13
       13
        
       # automatically pick up the changes.

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
       -
         version = "1.22.2.4282-a97b03fad";

     

       15
       15
       +
         version = "1.23.0.4482-62106842a";

     

       16
       16
        
         pname = "plexmediaserver";

     

       17
       17
        
       

     

       18
       18
        
         # Fetch the source

     

       19
       19
        
         src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {

     

       20
       20
        
           url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";

     

       21
       21
       -
           sha256 = "01krx6vhk24wm2hikxkfv8m53y8b4yqnkii4j9zf48f1a9hlj2zp";

     

       21
       21
       +
           sha256 = "0i4cfnzlzxh3vwd8kivy0dy6wg102j96v7p3mpivkwj15kjrl01v";

     

       22
       22
        
         } else fetchurl {

     

       23
       23
        
           url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";

     

       24
       24
       -
           sha256 = "04wzv15pnd4sn6cy62m8prvsxpxj4sg3q9ahwsrn2cj31vgayg0i";

     

       24
       24
       +
           sha256 = "0yh30712m23hmpqc4b83pbmadgslq72z8lc4prx2kp01n3p5hfkq";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         outputs = [ "out" "basedb" ];

+23

pkgs/tools/archivers/quickbms/default.nix

···

       1
       1
       +
       { stdenv, lib, fetchzip, bzip2, lzo, openssl, zlib }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         version = "0.11.0";

     

       5
       5
       +
         pname = "quickbms";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchzip {

     

       8
       8
       +
           url = "https://aluigi.altervista.org/papers/quickbms-src-${version}.zip";

     

       9
       9
       +
           hash = "sha256-uQKTE36pLO8uhrX794utqaDGUeyqRz6zLCQFA7DYkNc=";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         buildInputs = [ bzip2 lzo openssl zlib ];

     

       13
       13
       +
       

     

       14
       14
       +
         makeFlags = [ "PREFIX=$(out)" ];

     

       15
       15
       +
       

     

       16
       16
       +
         meta = with lib; {

     

       17
       17
       +
           description = "Universal script based file extractor and reimporter";

     

       18
       18
       +
           homepage = "https://aluigi.altervista.org/quickbms.htm";

     

       19
       19
       +
           license = licenses.gpl2Plus;

     

       20
       20
       +
           maintainers = with maintainers; [ samuelgrf ];

     

       21
       21
       +
           platforms = platforms.linux;

     

       22
       22
       +
         };

     

       23
       23
       +
       }

+3 -3

pkgs/tools/misc/pistol/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "pistol";

     

       9
       9
       -
         version = "0.1.9";

     

       9
       9
       +
         version = "0.2.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "doronbehar";

     

       13
       13
        
           repo = pname;

     

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

     

       15
       15
       -
           sha256 = "sha256-Q/W+1NvbuSu+QfezJpyeI5r4VlzdAAbOlSfFIT8knJs=";

     

       15
       15
       +
           sha256 = "sha256-c85XF1Glg6A7utPfXOv4LBesJy9+ErE2B+DO243mMhg=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         vendorSha256 = "sha256-oXt2nZ9lcAiI9ZQtKuQrXOXDfqx3Ucvh/K6g7SScd2Q=";

     

       18
       18
       +
         vendorSha256 = "sha256-n98cjXsgg2w3shbZPnk3g7mBbzV5Tc3jd9ZtiRk1KUM=";

     

       19
       19
        
       

     

       20
       20
        
         doCheck = false;

     

       21
       21

+2 -2

pkgs/tools/misc/xvfb-run/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, makeWrapper, xorgserver, getopt

     

       2
       2
        
       , xauth, util-linux, which, fontsConf, gawk, coreutils }:

     

       3
       3
        
       let

     

       4
       4
       -
         xvfb_run = fetchurl {

     

       4
       4
       +
         xvfb-run = fetchurl {

     

       5
       5
        
           name = "xvfb-run";

     

       6
       6
        
           # https://git.archlinux.org/svntogit/packages.git/?h=packages/xorg-server

     

       7
       7
        
           url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server&id=9cb733cefa92af3fca608fb051d5251160c9bbff";

     
···

       13
       13
        
         nativeBuildInputs = [ makeWrapper ];

     

       14
       14
        
         buildCommand = ''

     

       15
       15
        
           mkdir -p $out/bin

     

       16
       16
       -
           cp ${xvfb_run} $out/bin/xvfb-run

     

       16
       16
       +
           cp ${xvfb-run} $out/bin/xvfb-run

     

       17
       17
        
       

     

       18
       18
        
           chmod a+x $out/bin/xvfb-run

     

       19
       19
        
           patchShebangs $out/bin/xvfb-run

+6

pkgs/tools/typesetting/tex/texlive/bin.nix

···

       185
       185
        
       

     

       186
       186
        
               mkdir -p "$path" && cd "$path"

     

       187
       187
        
               "../../../$path/configure" $configureFlags $extraConfig

     

       188
       188
       +
       

     

       189
       189
       +
               if [[ "$path" =~ "libs/pplib" ]]; then

     

       190
       190
       +
                 # TODO: revert for texlive 2022

     

       191
       191
       +
                 # ../../../texk/web2c/luatexdir/luamd5/md5lib.c:197:10: fatal error: 'utilsha.h' file not found

     

       192
       192
       +
                 make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}

     

       193
       193
       +
               fi

     

       188
       194
        
             )

     

       189
       195
        
           done

     

       190
       196
        
         '';

+1

pkgs/top-level/aliases.nix

···

       872
       872
        
         xlibs = xorg; # added 2015-09

     

       873
       873
        
         xpraGtk3 = xpra; # added 2018-09-13

     

       874
       874
        
         xv = xxv; # added 2020-02-22

     

       875
       875
       +
         xvfb_run = xvfb-run; # added 2021-05-07

     

       875
       876
        
         yacc = bison; # moved from top-level 2021-03-14

     

       876
       877
        
         youtubeDL = youtube-dl;  # added 2014-10-26

     

       877
       878
        
         ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead";

+7 -3

pkgs/top-level/all-packages.nix

···

       7849
       7849
        
       

     

       7850
       7850
        
         qnial = callPackage ../development/interpreters/qnial { };

     

       7851
       7851
        
       

     

       7852
       7852
       +
         quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { };

     

       7853
       7853
       +
       

     

       7852
       7854
        
         ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { };

     

       7853
       7855
        
       

     

       7854
       7856
        
         q-text-as-data = callPackage ../tools/misc/q-text-as-data { };

     
···

       9753
       9755
        
       

     

       9754
       9756
        
         xxv = callPackage ../tools/misc/xxv {};

     

       9755
       9757
        
       

     

       9756
       9756
       -
         xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; };

     

       9758
       9758
       +
         xvfb-run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; };

     

       9757
       9759
        
       

     

       9758
       9760
        
         xvkbd = callPackage ../tools/X11/xvkbd {};

     

       9759
       9761
        
       

     
···

       11663
       11665
        
       

     

       11664
       11666
        
         urn = callPackage ../development/compilers/urn { };

     

       11665
       11667
        
       

     

       11666
       11666
       -
         urweb = callPackage ../development/compilers/urweb { };

     

       11668
       11668
       +
         urweb = callPackage ../development/compilers/urweb {

     

       11669
       11669
       +
           icu = icu67;

     

       11670
       11670
       +
         };

     

       11667
       11671
        
       

     

       11668
       11672
        
         vlang = callPackage ../development/compilers/vlang { };

     

       11669
       11673
        
       

     
···

       27562
       27566
        
           autoreconfHook = buildPackages.autoreconfHook269;

     

       27563
       27567
        
         };

     

       27564
       27568
        
       

     

       27565
       27565
       -
         ethabi = callPackage ../applications/blockchains/ethabi.nix { };

     

       27569
       27569
       +
         ethabi = callPackage ../applications/blockchains/ethabi { };

     

       27566
       27570
        
       

     

       27567
       27571
        
         pycoin = with python3Packages; toPythonApplication pycoin;

     

       27568
       27572

+1 -1

pkgs/top-level/perl-packages.nix

···

       9248
       9248
        
           propagatedBuildInputs = [ Readonly Gtk3 ];

     

       9249
       9249
        
           checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ];

     

       9250
       9250
        
           checkPhase = ''

     

       9251
       9251
       -
             ${pkgs.xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \

     

       9251
       9251
       +
             ${pkgs.xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \

     

       9252
       9252
        
               make test

     

       9253
       9253
        
           '';

     

       9254
       9254
        
           meta = {

+9 -3

pkgs/top-level/python-packages.nix

···

       1239
       1239
        
       

     

       1240
       1240
        
         cassandra-driver = callPackage ../development/python-modules/cassandra-driver { };

     

       1241
       1241
        
       

     

       1242
       1242
       +
         castepxbin = callPackage ../development/python-modules/castepxbin { };

     

       1243
       1243
       +
       

     

       1242
       1244
        
         casttube = callPackage ../development/python-modules/casttube { };

     

       1243
       1245
        
       

     

       1244
       1246
        
         catalogue = callPackage ../development/python-modules/catalogue { };

     
···

       1734
       1736
        
         debts = callPackage ../development/python-modules/debts { };

     

       1735
       1737
        
       

     

       1736
       1738
        
         debugpy = callPackage ../development/python-modules/debugpy { };

     

       1737
       1737
       -
       

     

       1738
       1738
       -
         debut = callPackage ../development/python-modules/debut { };

     

       1739
       1739
        
       

     

       1740
       1740
        
         decorator = callPackage ../development/python-modules/decorator { };

     

       1741
       1741
        
       

     
···

       4828
       4828
        
         pathtools = callPackage ../development/python-modules/pathtools { };

     

       4829
       4829
        
       

     

       4830
       4830
        
         pathvalidate = callPackage ../development/python-modules/pathvalidate { };

     

       4831
       4831
       +
       

     

       4832
       4832
       +
         pathy = callPackage ../development/python-modules/pathy/default.nix { };

     

       4831
       4833
        
       

     

       4832
       4834
        
         patiencediff = callPackage ../development/python-modules/patiencediff { };

     

       4833
       4835
        
       

     
···

       5872
       5874
        
       

     

       5873
       5875
        
         phonemizer = callPackage ../development/python-modules/phonemizer { };

     

       5874
       5876
        
       

     

       5875
       5875
       -
         pyopencl = callPackage ../development/python-modules/pyopencl { };

     

       5877
       5877
       +
         pyopencl = callPackage ../development/python-modules/pyopencl {

     

       5878
       5878
       +
           mesa_drivers = pkgs.mesa.drivers;

     

       5879
       5879
       +
         };

     

       5876
       5880
        
       

     

       5877
       5881
        
         pyopengl = callPackage ../development/python-modules/pyopengl { };

     

       5878
       5882
        
       

     
···

       7618
       7622
        
         soupsieve = callPackage ../development/python-modules/soupsieve { };

     

       7619
       7623
        
       

     

       7620
       7624
        
         spacy = callPackage ../development/python-modules/spacy { };

     

       7625
       7625
       +
       

     

       7626
       7626
       +
         spacy-legacy = callPackage ../development/python-modules/spacy/legacy.nix { };

     

       7621
       7627
        
       

     

       7622
       7628
        
         spacy_models = callPackage ../development/python-modules/spacy/models.nix { };

     

       7623
       7629