JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-05-08 18:22:46 +00:00 committed by GitHub
commit 6d46d8a9b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
86 changed files with 1267 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
maintainers/scripts/build.nix
View File

@ -1,10 +1,18 @@
{ maintainer }:
{ maintainer
, localSystem ? { system = args.system or builtins.currentSystem; }
, system ? localSystem.system
, crossSystem ? localSystem
, ...
}@args:
# based on update.nix
# nix-build build.nix --argstr maintainer <yourname>
# to build for aarch64-linux using boot.binfmt.emulatedSystems:
# nix-build build.nix --argstr maintainer <yourname> --argstr system aarch64-linux
let
pkgs = import ./../../default.nix {};
pkgs = import ./../../default.nix (removeAttrs args [ "maintainer" ]);
maintainer_ = pkgs.lib.maintainers.${maintainer};
packagesWith = cond: return: set:
(pkgs.lib.flatten

4
nixos/modules/misc/ids.nix
View File

@ -315,7 +315,7 @@ in
restya-board = 284;
mighttpd2 = 285;
hass = 286;
monero = 287;
#monero = 287; # dynamically allocated as of 2021-05-08
ceph = 288;
duplicati = 289;
monetdb = 290;
@ -617,7 +617,7 @@ in
restya-board = 284;
mighttpd2 = 285;
hass = 286;
monero = 287;
# monero = 287; # dynamically allocated as of 2021-05-08
ceph = 288;
duplicati = 289;
monetdb = 290;

20
nixos/modules/services/networking/monero.nix
View File

@ -4,7 +4,6 @@ with lib;
let
cfg = config.services.monero;
dataDir = "/var/lib/monero";
listToConf = option: list:
concatMapStrings (value: "${option}=${value}\n") list;
@ -53,11 +52,19 @@ in
enable = mkEnableOption "Monero node daemon";
dataDir = mkOption {
type = types.str;
default = "/var/lib/monero";
description = ''
The directory where Monero stores its data files.
'';
};
mining.enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to mine moneroj.
Whether to mine monero.
'';
};
@ -198,15 +205,14 @@ in
config = mkIf cfg.enable {
users.users.monero = {
uid = config.ids.uids.monero;
isSystemUser = true;
group = "monero";
description = "Monero daemon user";
home = dataDir;
home = cfg.dataDir;
createHome = true;
};
users.groups.monero = {
gid = config.ids.gids.monero;
};
users.groups.monero = { };
systemd.services.monero = {
description = "monero daemon";

3
nixos/tests/docker-tools-cross.nix
View File

@ -73,4 +73,7 @@ in {
"docker rmi ${hello2.imageName}",
)
'';
# Remove when the formatter has been removed and a linter has been added
skipLint = true;
})

5
nixos/tests/docker-tools-overlay.nix
View File

@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
{
name = "docker-tools-overlay";
meta = with pkgs.lib.maintainers; {
maintainers = [ lnl7 ];
maintainers = [ lnl7 roberth ];
};
nodes = {
@ -30,4 +30,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
# drw------- 99 0 0 100 Apr 14 11:36 /nix/store
docker.succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version")
'';
# Remove when the formatter has been removed and a linter has been added
skipLint = true;
})

5
nixos/tests/docker-tools.nix
View File

@ -3,7 +3,7 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "docker-tools";
meta = with pkgs.lib.maintainers; {
maintainers = [ lnl7 ];
maintainers = [ lnl7 roberth ];
};
nodes = {
@ -365,4 +365,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'"
)
'';
# Remove when the formatter has been removed and a linter has been added
skipLint = true;
})

3
nixos/tests/systemd-confinement.nix
View File

@ -59,7 +59,8 @@ import ./make-test-python.nix {
"chroot-exec chown 65534 /bin",
)
machine.succeed(
'test "$(chroot-exec id -u)" = 0', "chroot-exec chown 0 /bin",
'test "$(chroot-exec id -u)" = 0',
"chroot-exec chown 0 /bin",
)
'';
}

14
pkgs/applications/audio/guitarix/default.nix
View File

@ -1,5 +1,6 @@
{ lib, stdenv
, fetchurl
, fetchpatch
, avahi
, bluez
, boost
@ -41,13 +42,22 @@ in
stdenv.mkDerivation rec {
pname = "guitarix";
version = "0.41.0";
version = "0.42.1";
src = fetchurl {
url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz";
sha256 = "0qsfbyrrpb3bbdyq68k28mjql7kglxh8nqcw9jvja28x6x9ik5a0";
sha256 = "101c2hdpipj3s6rmva5wf3q9hfjv7bkyzi7s8sgaiys8f7h4czkr";
};
patches = [
(fetchpatch {
name = "guitarix-gcc11.patch";
url = "https://github.com/brummer10/guitarix/commit/d8f003484c57d808682025dfb07a7a1fb848afdc.patch";
stripLen = 1;
sha256 = "1qhlbf18cn6m9jdz3741nrdfqvznjna3daqmn9l10k5nd3asy4il";
})
];
nativeBuildInputs = [
gettext
hicolor-icon-theme

4
pkgs/applications/audio/quodlibet/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome, gtk3, gdk-pixbuf, librsvg,
tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme,
tag ? "", xvfb-run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme,
gst_all_1, withGstPlugins ? true,
xineBackend ? false, xine-lib,
withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false,
@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = [ wrapGAppsHook gettext ];
checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb_run dbus.daemon glibcLocales ]);
checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb-run dbus.daemon glibcLocales ]);
buildInputs = [ gnome.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
++ (if xineBackend then [ xine-lib ] else with gst_all_1;

4
pkgs/applications/audio/sublime-music/default.nix
View File

@ -5,7 +5,7 @@
, gtk3
, pango
, wrapGAppsHook
, xvfb_run
, xvfb-run
, chromecastSupport ? false
, serverSupport ? false
, keyringSupport ? true
@ -66,7 +66,7 @@ python3Packages.buildPythonApplication rec {
pytest
pytest-cov
];
checkPhase = "${xvfb_run}/bin/xvfb-run pytest";
checkPhase = "${xvfb-run}/bin/xvfb-run pytest";
# Also run the python import check for sanity
pythonImportsCheck = [ "sublime_music" ];

683
pkgs/applications/blockchains/ethabi/add-Cargo-lock.patch Normal file
View File

@ -0,0 +1,683 @@
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 0000000..05e3f0f
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,677 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ansi_term"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b"
+
+[[package]]
+name = "arrayvec"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+
+[[package]]
+name = "bitvec"
+version = "0.17.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c"
+dependencies = [
+ "either",
+ "radium",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
+dependencies = [
+ "block-padding",
+ "generic-array",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
+
+[[package]]
+name = "byte-slice-cast"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3"
+
+[[package]]
+name = "byteorder"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+
+[[package]]
+name = "bytes"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "clap"
+version = "2.33.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "bitflags",
+ "strsim",
+ "textwrap",
+ "unicode-width",
+ "vec_map",
+]
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "digest"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "either"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+
+[[package]]
+name = "ethabi"
+version = "13.0.0"
+dependencies = [
+ "anyhow",
+ "ethereum-types",
+ "hex",
+ "hex-literal",
+ "paste",
+ "serde",
+ "serde_json",
+ "sha3",
+ "thiserror",
+ "uint",
+]
+
+[[package]]
+name = "ethabi-cli"
+version = "13.0.0"
+dependencies = [
+ "anyhow",
+ "ethabi",
+ "hex",
+ "itertools",
+ "sha3",
+ "structopt",
+]
+
+[[package]]
+name = "ethabi-contract"
+version = "11.0.0"
+
+[[package]]
+name = "ethabi-derive"
+version = "13.0.0"
+dependencies = [
+ "anyhow",
+ "ethabi",
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "ethabi-tests"
+version = "0.1.1"
+dependencies = [
+ "ethabi",
+ "ethabi-contract",
+ "ethabi-derive",
+ "hex",
+ "hex-literal",
+]
+
+[[package]]
+name = "ethbloom"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22a621dcebea74f2a6f2002d0a885c81ccf6cbdf86760183316a7722b5707ca4"
+dependencies = [
+ "crunchy",
+ "fixed-hash",
+ "impl-rlp",
+ "impl-serde",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "ethereum-types"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05dc5f0df4915fa6dff7f975a8366ecfaaa8959c74235469495153e7bb1b280e"
+dependencies = [
+ "ethbloom",
+ "fixed-hash",
+ "impl-rlp",
+ "impl-serde",
+ "primitive-types",
+ "uint",
+]
+
+[[package]]
+name = "fixed-hash"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
+dependencies = [
+ "byteorder",
+ "rand",
+ "rustc-hex",
+ "static_assertions",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "heck"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hex-literal"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5af1f635ef1bc545d78392b136bfe1c9809e029023c84a3638a864a10b8819c8"
+
+[[package]]
+name = "impl-codec"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53"
+dependencies = [
+ "parity-scale-codec",
+]
+
+[[package]]
+name = "impl-rlp"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808"
+dependencies = [
+ "rlp",
+]
+
+[[package]]
+name = "impl-serde"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b47ca4d2b6931707a55fce5cf66aff80e2178c8b63bbb4ecb5695cbc870ddf6f"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "itertools"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
+
+[[package]]
+name = "keccak"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
+
+[[package]]
+name = "opaque-debug"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+
+[[package]]
+name = "parity-scale-codec"
+version = "1.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d"
+dependencies = [
+ "arrayvec",
+ "bitvec",
+ "byte-slice-cast",
+ "serde",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+
+[[package]]
+name = "primitive-types"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3824ae2c5e27160113b9e029a10ec9e3f0237bad8029f69c7724393c9fdefd8"
+dependencies = [
+ "fixed-hash",
+ "impl-codec",
+ "impl-rlp",
+ "impl-serde",
+ "uint",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "radium"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac"
+
+[[package]]
+name = "rand"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rlp"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e54369147e3e7796c9b885c7304db87ca3d09a0a98f72843d532868675bbfba8"
+dependencies = [
+ "bytes",
+ "rustc-hex",
+]
+
+[[package]]
+name = "rustc-hex"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
+
+[[package]]
+name = "ryu"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+
+[[package]]
+name = "serde"
+version = "1.0.125"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.125"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "sha3"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
+dependencies = [
+ "block-buffer",
+ "digest",
+ "keccak",
+ "opaque-debug",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
+[[package]]
+name = "structopt"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c"
+dependencies = [
+ "clap",
+ "lazy_static",
+ "structopt-derive",
+]
+
+[[package]]
+name = "structopt-derive"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90"
+dependencies = [
+ "heck",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
+[[package]]
+name = "typenum"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"
+
+[[package]]
+name = "uint"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e11fe9a9348741cf134085ad57c249508345fe16411b3d7fb4ff2da2f1d6382e"
+dependencies = [
+ "byteorder",
+ "crunchy",
+ "hex",
+ "static_assertions",
+]
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+
+[[package]]
+name = "vec_map"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
+[[package]]
+name = "version_check"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
+
+[[package]]
+name = "wasi"
+version = "0.10.2+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

14
pkgs/applications/blockchains/ethabi.nix → pkgs/applications/blockchains/ethabi/default.nix
View File

@ -2,22 +2,24 @@
rustPlatform.buildRustPackage rec {
pname = "ethabi";
version = "11.0.0";
version = "13.0.0";
src = fetchFromGitHub {
owner = "paritytech";
owner = "rust-ethereum";
repo = "ethabi";
rev = "v${version}";
sha256 = "1gqd3vwsvv1wvi659qcdywgmh41swblpwmmxb033k8irw581dwq4";
sha256 = "sha256-bl46CSVP1MMYI3tkVAHFrjMFwTt8QoleZCV9pMIMZyc=";
};
cargoSha256 = "1hx8qw51rl7sn9jmnclw0hc4rx619hf78hpaih5mvny3k0zgiwpm";
cargoSha256 = "sha256-Jz0uEP2/ZjLS+GbCp7lNyJQdFDjTSFthjBdC/Z4tkTs=";
cargoPatches = [ ./add-Cargo-lock.patch ];
meta = with lib; {
description = "Ethereum function call encoding (ABI) utility";
homepage = "https://github.com/ethcore/ethabi/";
homepage = "https://github.com/rust-ethereum/ethabi";
maintainers = [ maintainers.dbrock ];
license = licenses.gpl3;
license = licenses.asl20;
inherit version;
};
}

4
pkgs/applications/editors/gnome-builder/default.nix
View File

@ -34,7 +34,7 @@
, webkitgtk
, wrapGAppsHook
, dbus
, xvfb_run
, xvfb-run
}:
stdenv.mkDerivation rec {
@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
checkInputs = [
dbus
xvfb_run
xvfb-run
];
outputs = [ "out" "devdoc" ];

4
pkgs/applications/graphics/gscan2pdf/default.nix
View File

@ -4,7 +4,7 @@
# runtime dependencies
imagemagick, libtiff, djvulibre, poppler_utils, ghostscript, unpaper, pdftk,
# test dependencies
xvfb_run, liberation_ttf, file, tesseract }:
xvfb-run, liberation_ttf, file, tesseract }:
with lib;
@ -94,7 +94,7 @@ perlPackages.buildPerlPackage rec {
unpaper
pdftk
xvfb_run
xvfb-run
file
tesseract # tests are expecting tesseract 3.x precisely
] ++ (with perlPackages; [

4
pkgs/applications/graphics/vimiv/default.nix
View File

@ -2,7 +2,7 @@
, gnome
# Test requirements
, dbus, xvfb_run, xdotool
, dbus, xvfb-run, xdotool
}:
python3Packages.buildPythonApplication rec {
@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec {
vimiv/imageactions.py
'';
checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ];
checkInputs = [ python3Packages.nose dbus.daemon xvfb-run xdotool ];
buildInputs = [ gnome.adwaita-icon-theme librsvg ];
propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ];

4
pkgs/applications/misc/girara/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, check, dbus, xvfb_run, glib, gtk, gettext, libiconv, json_c, libintl
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, check, dbus, xvfb-run, glib, gtk, gettext, libiconv, json_c, libintl
}:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1n3i960b458172mc3pkq7m9dn5qxry6fms3c3k06v27cjp5whsyf";
};
nativeBuildInputs = [ meson ninja pkg-config gettext check dbus xvfb_run ];
nativeBuildInputs = [ meson ninja pkg-config gettext check dbus xvfb-run ];
buildInputs = [ libintl libiconv json_c ];
propagatedBuildInputs = [ glib gtk ];

4
pkgs/applications/misc/pytrainer/default.nix
View File

@ -13,7 +13,7 @@
, tzdata
, webkitgtk
, wrapGAppsHook
, xvfb_run
, xvfb-run
}:
let
@ -66,7 +66,7 @@ in python.pkgs.buildPythonApplication rec {
checkInputs = [
glibcLocales
perl
xvfb_run
xvfb-run
] ++ (with python.pkgs; [
mysqlclient
psycopg2

4
pkgs/applications/misc/ulauncher/default.nix
View File

@ -14,7 +14,7 @@
, libappindicator
, intltool
, wmctrl
, xvfb_run
, xvfb-run
, librsvg
}:
@ -66,7 +66,7 @@ python3Packages.buildPythonApplication rec {
mock
pytest
pytest-mock
xvfb_run
xvfb-run
];
patches = [

10
pkgs/applications/misc/xneur/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, xorg, pcre, gst_all_1, glib
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, xorg, pcre, gst_all_1, glib
, xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }:
stdenv.mkDerivation {
@ -21,6 +21,14 @@ stdenv.mkDerivation {
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
];
patches = [
(fetchpatch {
name = "gcc-10.patch";
url = "https://salsa.debian.org/debian/xneur/-/raw/da38ad9c8e1bf4e349f5ed4ad909f810fdea44c9/debian/patches/gcc-10.patch";
sha256 = "0pc17a4sdrnrc4z7gz28889b9ywqsm5mzm6m41h67j2f5zh9k3fy";
})
];
postPatch = ''
sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure
'';

4
pkgs/applications/networking/calls/default.nix
View File

@ -21,7 +21,7 @@
, dbus
, vala
, wrapGAppsHook
, xvfb_run
, xvfb-run
, gtk-doc
, docbook-xsl-nons
, docbook_xml_dtd_43
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
checkInputs = [
dbus
xvfb_run
xvfb-run
];
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

4
pkgs/applications/networking/flent/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python
, pythonPackages, qt5, sphinx, xvfb_run }:
, pythonPackages, qt5, sphinx, xvfb-run }:
buildPythonApplication rec {
pname = "flent";
@ -12,7 +12,7 @@ buildPythonApplication rec {
buildInputs = [ sphinx ];
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
propagatedBuildInputs = [ matplotlib procps pyqt5 ];
checkInputs = [ procps pythonPackages.mock pyqt5 xvfb_run ];
checkInputs = [ procps pythonPackages.mock pyqt5 xvfb-run ];
checkPhase = ''
cat >test-runner <<EOF

4
pkgs/applications/networking/instant-messengers/gajim/default.nix
View File

@ -5,7 +5,7 @@
, glib-networking
# Test dependencies
, xvfb_run, dbus
, xvfb-run, dbus
# Optional dependencies
, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-good, libnice
@ -52,7 +52,7 @@ python3.pkgs.buildPythonApplication rec {
++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
++ extraPythonPackages python3.pkgs;
checkInputs = [ xvfb_run dbus.daemon ];
checkInputs = [ xvfb-run dbus.daemon ];
checkPhase = ''
# https://dev.gajim.org/gajim/gajim/-/issues/10478

4
pkgs/applications/office/gtg/default.nix
View File

@ -11,7 +11,7 @@
, pango
, gdk-pixbuf
, gobject-introspection
, xvfb_run
, xvfb-run
}:
python3Packages.buildPythonApplication rec {
@ -53,7 +53,7 @@ python3Packages.buildPythonApplication rec {
checkInputs = with python3Packages; [
nose
mock
xvfb_run
xvfb-run
];
preBuild = ''

4
pkgs/applications/office/kmymoney/default.nix
View File

@ -8,7 +8,7 @@
, sqlcipher
# Needed for running tests:
, qtbase, xvfb_run
, qtbase, xvfb-run
, python2, python3Packages
}:
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
'';
doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;
installCheckInputs = [ xvfb_run ];
installCheckInputs = [ xvfb-run ];
installCheckPhase =
lib.optionalString doInstallCheck ''
xvfb-run -s '-screen 0 1024x768x24' make test \

4
pkgs/applications/office/paperwork/paperwork-gtk.nix
View File

@ -4,7 +4,7 @@
, cairo
, gnome
, librsvg
, xvfb_run
, xvfb-run
, dbus
, libnotify
, wrapGAppsHook
@ -53,7 +53,7 @@ python3Packages.buildPythonApplication rec {
done
'';
checkInputs = [ xvfb_run dbus.daemon ];
checkInputs = [ xvfb-run dbus.daemon ];
nativeBuildInputs = [
wrapGAppsHook

8
pkgs/applications/video/dvdstyler/default.nix
View File

@ -6,11 +6,14 @@
, docbook5
, dvdauthor
, dvdplusrwtools
, ffmpeg
, flex
, fontconfig
, gettext
, libexif
, makeWrapper
, pkg-config
, wxGTK30
, wxSVG
, xine-ui
, xmlto
@ -42,11 +45,14 @@ in stdenv.mkDerivation rec {
docbook5
dvdauthor
dvdplusrwtools
ffmpeg
flex
fontconfig
gettext
libexif
makeWrapper
wxSVG
wxGTK30
xine-ui
xmlto
zip
@ -67,6 +73,8 @@ in stdenv.mkDerivation rec {
wrapProgram $out/bin/dvdstyler --prefix PATH ":" "${binPath}"
'';
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://www.dvdstyler.org/";
description = "A DVD authoring software";

18
pkgs/applications/video/qmediathekview/default.nix
View File

@ -1,13 +1,22 @@
{ mkDerivation, lib, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkg-config }:
{ lib
, stdenv
, mkDerivation
, fetchFromGitHub
, boost
, qtbase
, xz
, qmake
, pkg-config
}:
mkDerivation rec {
pname = "QMediathekView";
version = "2019-01-06";
version = "0.2.1";
src = fetchFromGitHub {
owner = "adamreichold";
repo = pname;
rev = "e098aaec552ec4e367078bf19953a08067316b4b";
rev = "v${version}";
sha256 = "0i9hac9alaajbra3lx23m0iiq6ww4is00lpbzg5x70agjrwj0nd6";
};
@ -16,7 +25,7 @@ mkDerivation rec {
--replace /usr ""
'';
buildInputs = [ qtbase qttools xz boost ];
buildInputs = [ qtbase xz boost ];
nativeBuildInputs = [ qmake pkg-config ];
@ -28,5 +37,6 @@ mkDerivation rec {
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ dotlambda ];
broken = stdenv.isAarch64;
};
}

2
pkgs/applications/video/xine-ui/default.nix
View File

@ -46,8 +46,6 @@ stdenv.mkDerivation rec {
xorgproto
]);
postPatch = "sed -e '/curl\/types\.h/d' -i src/xitk/download.c";
configureFlags = [ "--with-readline=${readline.dev}" ];
LIRC_CFLAGS="-I${lirc}/include";

8
pkgs/applications/window-managers/dwm/dwm-status.nix
View File

@ -9,19 +9,19 @@ in
rustPlatform.buildRustPackage rec {
pname = "dwm-status";
version = "unstable-2021-05-04";
version = "1.7.2";
src = fetchFromGitHub {
owner = "Gerschtli";
repo = pname;
rev = "c5b1fda78a8175cb53df9d31ae037c58279df810";
sha256 = "sha256-dJUQ7vuz9OC6eU00Snbbza63j01ms54sXO1kqheun+8=";
rev = version;
sha256 = "sha256-Y1J0nCVEmGKgQP+GEtPqK8l3SRuls5yesvJuowLDzUo=";
};
nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ];
cargoSha256 = "sha256-zSt6iNZ9hmvAgFEXzqfovRsMryVyFWHm68G7J3SMztY=";
cargoSha256 = "sha256-8/vzJXZjSQmefHMo5BXKTRiLy2F3wfIn8VgPMJxtIvY=";
postInstall = lib.optionalString (bins != []) ''
wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}"

4
pkgs/applications/window-managers/i3/default.nix
View File

@ -1,7 +1,7 @@
{ fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms
, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev
, yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon
, xorgserver, xvfb_run }:
, xorgserver, xvfb-run }:
stdenv.mkDerivation rec {
pname = "i3";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango
perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun
perlPackages.ExtUtilsPkgConfig perlPackages.InlineC
xorgserver xvfb_run
xorgserver xvfb-run
];
configureFlags = [ "--disable-builddir" ];

4
pkgs/applications/window-managers/phosh/default.nix
View File

@ -18,7 +18,7 @@
, upower
, wayland
, dbus
, xvfb_run
, xvfb-run
, phoc
, feedbackd
, networkmanager
@ -98,7 +98,7 @@ in stdenv.mkDerivation rec {
checkInputs = [
dbus
xvfb_run
xvfb-run
];
# Temporarily disabled - Test is broken (SIGABRT)

4
pkgs/desktops/cinnamon/cjs/default.nix
View File

@ -20,7 +20,7 @@
, meson
, sysprof
, dbus
, xvfb_run
, xvfb-run
, ninja
, makeWrapper
, which
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
];
checkInputs = [
xvfb_run
xvfb-run
];
propagatedBuildInputs = [

4
pkgs/desktops/gnome/core/totem/default.nix
View File

@ -25,7 +25,7 @@
, gnome-desktop
, gsettings-desktop-schemas
, gdk-pixbuf
, xvfb_run
, xvfb-run
}:
stdenv.mkDerivation rec {
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
];
checkInputs = [
xvfb_run
xvfb-run
];
mesonFlags = [

4
pkgs/desktops/gnome/misc/geary/default.nix
View File

@ -29,7 +29,7 @@
, python3
, gnutls
, cacert
, xvfb_run
, xvfb-run
, glibcLocales
, dbus
, shared-mime-info
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
dbus
gnutls # for certtool
cacert # trust store for glib-networking
xvfb_run
xvfb-run
glibcLocales # required by Geary.ImapDb.DatabaseTest/utf8_case_insensitive_collation
];

2
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1899,4 +1899,6 @@ self: super: {
# https://github.com/travitch/haggle/issues/4
haggle = doJailbreak super.haggle;
phonetic-languages-phonetics-basics = appendPatch super.phonetic-languages-phonetics-basics ./patches/phonetic-languages-phonetics-basics-haddock.patch;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

46
pkgs/development/haskell-modules/patches/phonetic-languages-phonetics-basics-haddock.patch Normal file
View File

@ -0,0 +1,46 @@
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
--- phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs 2021-04-30 17:45:52.000000000 +0200
+++ phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs 2021-05-08 18:16:15.054951952 +0200
@@ -1,11 +1,11 @@
--- |
--- Module : Data.Phonetic.Languages.SpecificationsRead
--- Copyright : (c) OleksandrZhabenko 2021
--- License : MIT
--- Stability : Experimental
--- Maintainer : olexandr543@yahoo.com
---
-{-| Provides functions to read data specifications for other modules from textual files.
+{-|
+Module : Data.Phonetic.Languages.SpecificationsRead
+Copyright : (c) OleksandrZhabenko 2021
+License : MIT
+Stability : Experimental
+Maintainer : olexandr543@yahoo.com
+
+Provides functions to read data specifications for other modules from textual files.
-}
module Data.Phonetic.Languages.SpecificationsRead where
diff -ru phonetic-languages-phonetics-basics-0.5.1.0/Main.hs phonetic-languages-phonetics-basics-0.5.1.0/Main.hs
--- phonetic-languages-phonetics-basics-0.5.1.0/Main.hs 2021-04-30 17:45:52.000000000 +0200
+++ phonetic-languages-phonetics-basics-0.5.1.0/Main.hs 2021-05-08 18:14:06.344145599 +0200
@@ -1,11 +1,11 @@
--- |
--- Module : Main
--- Copyright : (c) OleksandrZhabenko 2020-2021
--- License : MIT
--- Stability : Experimental
--- Maintainer : olexandr543@yahoo.com
---
-{-| Can be used to calculate the durations of the approximations of the phonemes
+{-|
+Module : Main
+Copyright : (c) OleksandrZhabenko 2020-2021
+License : MIT
+Stability : Experimental
+Maintainer : olexandr543@yahoo.com
+
+Can be used to calculate the durations of the approximations of the phonemes
using some prepared text with its correct (at least mostly) pronunciation.
The prepared text is located in the same directory and contains lines -the
phonetic language word and its duration in seconds separated with whitespace.

7
pkgs/development/idris-modules/sdl2.nix
View File

@ -12,8 +12,11 @@ build-idris-package rec {
idrisDeps = [ effects ];
extraBuildInputs = [
nativeBuildInputs = [
pkg-config
];
extraBuildInputs = [
SDL2
SDL2_gfx
];
@ -24,7 +27,7 @@ build-idris-package rec {
owner = "steshaw";
repo = "idris-sdl2";
rev = version;
sha256 = "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv";
sha256 = "1jslnlzyw04dcvcd7xsdjqa7waxzkm5znddv76sv291jc94xhl4a";
};
meta = {

6
pkgs/development/interpreters/falcon/default.nix
View File

@ -11,12 +11,16 @@ stdenv.mkDerivation {
sha256 = "1x3gdcz1gqhi060ngqi0ghryf69v8bn50yrbzfad8bhblvhzzdlf";
};
# -Wnarrowing is enabled by default in recent GCC versions,
# causing compilation to fail.
NIX_CFLAGS_COMPILE = "-Wno-narrowing";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ pcre zlib sqlite ];
meta = with lib; {
description = "Programming language with macros and syntax at once";
license = licenses.gpl2;
license = licenses.gpl2Only;
maintainers = with maintainers; [ pSub ];
platforms = with platforms; linux;
};

4
pkgs/development/libraries/amtk/default.nix
View File

@ -7,7 +7,7 @@
, gobject-introspection
, gnome
, dbus
, xvfb_run
, xvfb-run
}:
stdenv.mkDerivation rec {
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
doCheck = stdenv.isLinux;
checkPhase = ''
export NO_AT_BRIDGE=1
${xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
${xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
meson test --print-errorlogs
'';

4
pkgs/development/libraries/gjs/default.nix
View File

@ -19,7 +19,7 @@
, harfbuzz
, makeWrapper
, which
, xvfb_run
, xvfb-run
, nixosTests
}:
@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
];
checkInputs = [
xvfb_run
xvfb-run
] ++ testDeps;
propagatedBuildInputs = [

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

@ -12,7 +12,7 @@
, epoxy
, gnome
, makeFontsConf
, xvfb_run
, xvfb-run
}:
stdenv.mkDerivation rec {
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
];
checkInputs = [
xvfb_run
xvfb-run
];
# Tests require fontconfig.

4
pkgs/development/libraries/gtksourceview/3.x.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala
, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb-run, shared-mime-info }:
stdenv.mkDerivation rec {
pname = "gtksourceview";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config intltool perl gobject-introspection vala ];
checkInputs = [ xvfb_run dbus ];
checkInputs = [ xvfb-run dbus ];
buildInputs = [ atk cairo glib pango libxml2 gettext ];

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

@ -18,7 +18,7 @@
, gnome
, gobject-introspection
, dbus
, xvfb_run
, xvfb-run
, shared-mime-info
}:
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
];
checkInputs = [
xvfb_run
xvfb-run
dbus
];

4
pkgs/development/libraries/gtksourceview/5.x.nix
View File

@ -16,7 +16,7 @@
, gnome
, gobject-introspection
, dbus
, xvfb_run
, xvfb-run
, shared-mime-info
}:
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
];
checkInputs = [
xvfb_run
xvfb-run
dbus
];

4
pkgs/development/libraries/libadwaita/default.nix
View File

@ -10,7 +10,7 @@
, vala
, gobject-introspection
, gtk4
, xvfb_run
, xvfb-run
}:
stdenv.mkDerivation rec {
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
];
checkInputs = [
xvfb_run
xvfb-run
];
doCheck = true;

4
pkgs/development/libraries/libdazzle/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2
, gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb_run, glib, gtk3, gnome }:
, gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb-run, glib, gtk3, gnome }:
stdenv.mkDerivation rec {
pname = "libdazzle";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "19abrrjsyjhhl1xflnb0likb9wwzz78fa1mk2b064rpscmz9mafv";
};
nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ];
nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb-run glib ];
buildInputs = [ glib gtk3 ];
mesonFlags = [

4
pkgs/development/libraries/libhandy/0.x.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala
, gtk-doc, docbook_xsl, docbook_xml_dtd_43
, gtk3, gnome
, dbus, xvfb_run, libxml2
, dbus, xvfb-run, libxml2
, hicolor-icon-theme
}:
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
gtk-doc docbook_xsl docbook_xml_dtd_43
];
buildInputs = [ gnome.gnome-desktop gtk3 libxml2 ];
checkInputs = [ dbus xvfb_run hicolor-icon-theme ];
checkInputs = [ dbus xvfb-run hicolor-icon-theme ];
mesonFlags = [
"-Dgtk_doc=true"

4
pkgs/development/libraries/libhandy/default.nix
View File

@ -13,7 +13,7 @@
, enableGlade ? false
, glade
, dbus
, xvfb_run
, xvfb-run
, libxml2
, gdk-pixbuf
, librsvg
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
checkInputs = [
dbus
xvfb_run
xvfb-run
at-spi2-atk
at-spi2-core
librsvg

4
pkgs/development/libraries/libsecret/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3
, docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala
, gtk-doc, gnome, gjs, libintl, dbus, xvfb_run }:
, gtk-doc, gnome, gjs, libintl, dbus, xvfb-run }:
stdenv.mkDerivation rec {
pname = "libsecret";
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
installCheckInputs = [
python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb_run dbus gjs
python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb-run dbus gjs
];
# needs to run after install because typelibs point to absolute paths

13
pkgs/development/libraries/xine-lib/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, aalib
, alsaLib
, ffmpeg
@ -16,6 +15,7 @@
, libtheora
, libv4l
, libvorbis
, ncurses
, perl
, pkg-config
, speex
@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
libtheora
libv4l
libvorbis
ncurses
perl
speex
vcdimager
@ -64,18 +65,10 @@ stdenv.mkDerivation rec {
libxcb
]);
patches = [
# splitting path plugin
(fetchpatch {
name = "0001-fix-XINE_PLUGIN_PATH-splitting.patch";
url = "https://sourceforge.net/p/xine/mailman/attachment/32394053-5e27-6558-f0c9-49e0da0bc3cc%40gmx.de/1/";
sha256 = "sha256-LJedxrD8JWITDo9pnS9BCmy7wiPTyJyoQ1puX49tOls=";
})
];
enableParallelBuilding = true;
NIX_LDFLAGS = "-lxcb-shm";
enableParallelBuilding = true;
meta = with lib; {
homepage = "http://www.xinehq.de/";

37
pkgs/development/python-modules/castepxbin/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, numpy
, scipy
, pymatgen
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "castepxbin";
version = "0.1.0";
src = fetchFromGitHub {
owner = "zhubonan";
repo = "castepxbin";
rev = "v${version}";
sha256 = "16wnd1mwhl204d1s3har2fhyhyjg86sypg00bj812dxk8zixxszf";
};
propagatedBuildInputs = [
numpy
scipy
pymatgen
];
checkInputs = [
pytestCheckHook
];
meta = with lib; {
description = "A collection of readers for CASTEP binary outputs";
homepage = "https://github.com/zhubonan/castepxbin";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

38
pkgs/development/python-modules/debut/default.nix
View File

@ -1,38 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, chardet
, attrs
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "debut";
version = "0.9.9";
src = fetchPypi {
inherit pname version;
sha256 = "a3a71e475295f4cf4292440c9c7303ebca0309d395536d2a7f86a5f4d7465dc1";
};
dontConfigure = true;
propagatedBuildInputs = [
chardet
attrs
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"debut"
];
meta = with lib; {
description = "Python library to parse Debian deb822-style control and copyright files ";
homepage = "https://github.com/nexB/debut";
license = with licenses; [ asl20 bsd3 mit ];
maintainers = teams.determinatesystems.members;
};
}

4
pkgs/development/python-modules/dogtail/default.nix
View File

@ -10,7 +10,7 @@
, gsettings-desktop-schemas
, fetchurl
, dbus
, xvfb_run
, xvfb-run
, wrapGAppsHook
# , fetchPypi
}:
@ -33,7 +33,7 @@ buildPythonPackage {
./nix-support.patch
];
nativeBuildInputs = [ gobject-introspection dbus xvfb_run wrapGAppsHook ]; # for setup hooks
nativeBuildInputs = [ gobject-introspection dbus xvfb-run wrapGAppsHook ]; # for setup hooks
propagatedBuildInputs = [ at-spi2-core gtk3 pygobject3 pyatspi pycairo ];
strictDeps = false; # issue 56943

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

@ -13,13 +13,13 @@
buildPythonPackage rec {
pname = "drf-nested-routers";
version = "0.92.5";
version = "0.93.3";
src = fetchFromGitHub {
owner = "alanjds";
repo = "drf-nested-routers";
rev = "v${version}";
sha256 = "1l1jza8xz6xcm3gwxh1k6pc8fs95cq3v751gxj497y1a83d26j8i";
sha256 = "1gmw6gwiqzfysx8qn7aan7xgkizxy64db94z30pm3bvn6jxv08si";
};
propagatedBuildInputs = [ django djangorestframework setuptools ];

24
pkgs/development/python-modules/hidapi/default.nix
View File

@ -1,4 +1,13 @@
{ lib, stdenv, libusb1, udev, darwin, fetchPypi, buildPythonPackage, cython }:
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, xcbuild
, cython
, libusb1
, udev
, darwin
}:
buildPythonPackage rec {
pname = "hidapi";
@ -9,18 +18,17 @@ buildPythonPackage rec {
sha256 = "a1170b18050bc57fae3840a51084e8252fd319c0fc6043d68c8501deb0e25846";
};
propagatedBuildInputs =
lib.optionals stdenv.isLinux [ libusb1 udev ] ++
lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit ]) ++
[ cython ];
nativeBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ];
propagatedBuildInputs = [ cython ]
++ lib.optionals stdenv.isLinux [ libusb1 udev ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit ]);
# Fix the USB backend library lookup
postPatch = lib.optionalString stdenv.isLinux ''
libusb=${libusb1.dev}/include/libusb-1.0
test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py
'' + lib.optionalString stdenv.isDarwin ''
substituteInPlace setup.py --replace 'macos_sdk_path =' 'macos_sdk_path = "" #'
'';
pythonImportsCheck = [ "hid" ];
@ -30,7 +38,7 @@ buildPythonPackage rec {
homepage = "https://github.com/trezor/cython-hidapi";
# license can actually be either bsd3 or gpl3
# see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt
license = licenses.bsd3;
license = with licenses; [ bsd3 gpl3Only ];
maintainers = with maintainers; [ np prusnak ];
};
}

4
pkgs/development/python-modules/liblarch/default.nix
View File

@ -3,7 +3,7 @@
, buildPythonPackage
, python
, pygobject3
, xvfb_run
, xvfb-run
, gobject-introspection
, gtk3
, pythonOlder
@ -32,7 +32,7 @@ buildPythonPackage rec {
checkPhase = ''
runHook preCheck
${xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \
${xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \
${python.interpreter} nix_run_setup test
runHook postCheck
'';

44
pkgs/development/python-modules/pathy/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, typer
, dataclasses
, smart_open
, pytest
, mock
, google-cloud-storage
}:
buildPythonPackage rec {
pname = "pathy";
version = "0.5.2";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-nb8my/5rkc7thuHnXZHe1Hg8j+sLBlYyJcLHWrrKZ5M=";
};
propagatedBuildInputs = [ smart_open typer google-cloud-storage ];
postPatch = ''
substituteInPlace requirements.txt \
--replace "smart-open>=2.2.0,<4.0.0" "smart-open>=2.2.0"
'';
checkInputs = [ pytestCheckHook mock ];
# Exclude tests that require provider credentials
pytestFlagsArray = [
"--ignore=pathy/_tests/test_clients.py"
"--ignore=pathy/_tests/test_gcs.py"
"--ignore=pathy/_tests/test_s3.py"
];
meta = with lib; {
description = "A Path interface for local and cloud bucket storage";
homepage = "https://github.com/justindujardin/pathy";
license = licenses.asl20;
maintainers = with maintainers; [ melling ];
};
}

9
pkgs/development/python-modules/pyopencl/default.nix
View File

@ -1,4 +1,5 @@
{ lib
, stdenv
, fetchPypi
, buildPythonPackage
, Mako
@ -12,14 +13,18 @@
, opencl-headers
, ocl-icd
, pybind11
, mesa_drivers
}:
buildPythonPackage rec {
let
os-specific-buildInputs =
if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ];
in buildPythonPackage rec {
pname = "pyopencl";
version = "2021.1.4";
checkInputs = [ pytest ];
buildInputs = [ opencl-headers ocl-icd pybind11 ];
buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs;
propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ];

4
pkgs/development/python-modules/pystray/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub
, pillow, xlib, six, xvfb_run, sphinx }:
, pillow, xlib, six, xvfb-run, sphinx }:
buildPythonPackage rec {
pname = "pystray";
@ -14,7 +14,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ sphinx ];
propagatedBuildInputs = [ pillow xlib six ];
checkInputs = [ xvfb_run ];
checkInputs = [ xvfb-run ];
checkPhase = ''
rm tests/icon_tests.py # test needs user input

4
pkgs/development/python-modules/pywebview/default.nix
View File

@ -6,7 +6,7 @@
, pytest
, pythonOlder
, qt5
, xvfb_run
, xvfb-run
}:
buildPythonPackage rec {
@ -31,7 +31,7 @@ buildPythonPackage rec {
checkInputs = [
pytest
xvfb_run
xvfb-run
];
checkPhase = ''

13
pkgs/development/python-modules/spacy/default.nix
View File

@ -7,6 +7,7 @@
, blis
, catalogue
, cymem
, jinja2
, jsonschema
, murmurhash
, numpy
@ -16,8 +17,12 @@
, requests
, setuptools
, srsly
, spacy-legacy
, thinc
, wasabi
, packaging
, pathy
, pydantic
}:
buildPythonPackage rec {
@ -33,6 +38,7 @@ buildPythonPackage rec {
blis
catalogue
cymem
jinja2
jsonschema
murmurhash
numpy
@ -41,8 +47,12 @@ buildPythonPackage rec {
requests
setuptools
srsly
spacy-legacy
thinc
wasabi
packaging
pathy
pydantic
] ++ lib.optional (pythonOlder "3.4") pathlib;
checkInputs = [
@ -60,7 +70,8 @@ buildPythonPackage rec {
--replace "catalogue>=0.0.7,<1.1.0" "catalogue>=0.0.7,<3.0" \
--replace "plac>=0.9.6,<1.2.0" "plac>=0.9.6,<2.0" \
--replace "srsly>=1.0.2,<1.1.0" "srsly>=1.0.2,<3.0" \
--replace "thinc>=7.4.1,<7.5.0" "thinc>=7.4.1,<8"
--replace "thinc>=7.4.1,<7.5.0" "thinc>=7.4.1,<8" \
--replace "pydantic>=1.7.1,<1.8.0" "pydantic>=1.7.1,<1.8.3"
'';
pythonImportsCheck = [ "spacy" ];

26
pkgs/development/python-modules/spacy/legacy.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib
, fetchPypi
, buildPythonPackage
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "spacy-legacy";
version = "3.0.5";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Uy94rjFllSj622RTzd6UJaQmIniCw4gpeq/X57QcIpA=";
};
# checkInputs = [ pytestCheckHook spacy ];
doCheck = false;
pythonImportsCheck = [ "spacy_legacy" ];
meta = with lib; {
description = "A Path interface for local and cloud bucket storage";
homepage = "https://github.com/justindujardin/pathy";
license = licenses.asl20;
maintainers = with maintainers; [ melling ];
};
}

33
pkgs/development/python-modules/sumo/default.nix
View File

@ -1,37 +1,44 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy27
{ lib, buildPythonPackage, fetchFromGitHub
, pythonOlder
, h5py
, matplotlib
, numpy
, phonopy
, pymatgen
, pytest
, scipy
, seekpath
, spglib
, castepxbin
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "sumo";
version = "2.2.1";
version = "2.2.4";
disabled = pythonOlder "3.6";
# No tests in Pypi tarball
src = fetchFromGitHub {
owner = "SMTG-UCL";
repo = "sumo";
rev = "v${version}";
sha256 = "0r88f5w33h9b0mv7shlqc4przwvas5ycgndvl91wqjnm3b2s3ix0";
sha256 = "051353gsxmh4qnabshfnc00mmzdbh1fgk1xdfnsfgcnijxgw25bb";
};
propagatedBuildInputs = [ numpy scipy spglib pymatgen h5py matplotlib seekpath phonopy ];
propagatedBuildInputs = [
spglib
numpy
scipy
h5py
pymatgen
phonopy
matplotlib
seekpath
castepxbin
];
checkInputs = [ pytest ];
checkPhase = ''
pytest .
'';
# tests have type annotations, can only run on 3.5+
doCheck = (!isPy27);
checkInputs = [ pytestCheckHook ];
meta = with lib; {
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 Normal file
View File

@ -0,0 +1,40 @@
From d944d8fa6cb6d1667f3e4c4e0cff4c4b2a7c0a30 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Fri, 7 May 2021 11:00:46 -0700
Subject: [PATCH] Replace `debut` with `debian-inspector`
---
requirements.in | 2 +-
tern/analyze/common.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/requirements.in b/requirements.in
index edd90ab..5135841 100644
--- a/requirements.in
+++ b/requirements.in
@@ -12,6 +12,6 @@ requests
stevedore
pbr
dockerfile-parse
-debut
+debian-inspector
regex
GitPython
diff --git a/tern/analyze/common.py b/tern/analyze/common.py
index 6962404..0f5e77d 100644
--- a/tern/analyze/common.py
+++ b/tern/analyze/common.py
@@ -19,8 +19,8 @@ from tern.utils import cache
from tern.utils import constants
from tern.utils import general
from tern.utils import rootfs
-from debut import debcon
-from debut import copyright as debut_copyright
+from debian_inspector import debcon
+from debian_inspector import copyright as debut_copyright
# global logger
logger = logging.getLogger(constants.logger_name)
--
2.31.1

12
pkgs/development/python-modules/tern/default.nix
View File

@ -7,7 +7,7 @@
, requests
, stevedore
, pbr
, debut
, debian-inspector
, regex
, GitPython
, prettytable
@ -22,6 +22,14 @@ buildPythonPackage rec {
sha256 = "606c62944991b2cbcccf3f5353be693305d6d7d318c3865b9ecca49dbeab2727";
};
patches = [
# debut was renamed to debian-inspector
# https://github.com/tern-tools/tern/pull/962
# NOTE: Has to be in-tree because the upstream patch doesn't apply cleanly
# to the PyPi source.
./0001-Replace-debut-with-debian-inspector.patch
];
preBuild = ''
cp requirements.{in,txt}
'';
@ -36,7 +44,7 @@ buildPythonPackage rec {
dockerfile-parse
requests
stevedore
debut
debian-inspector
regex
GitPython
prettytable

4
pkgs/development/python-modules/xdot/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k, python3, xvfb_run
{ lib, buildPythonPackage, fetchPypi, isPy3k, python3, xvfb-run
, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gtk3, numpy }:
buildPythonPackage rec {
@ -13,7 +13,7 @@ buildPythonPackage rec {
disabled = !isPy3k;
nativeBuildInputs = [ wrapGAppsHook ];
propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 numpy ];
checkInputs = [ xvfb_run ];
checkInputs = [ xvfb-run ];
checkPhase = ''
xvfb-run -s '-screen 0 800x600x24' ${python3.interpreter} nix_run_setup test

6
pkgs/development/r-modules/generic-builder.nix
View File

@ -1,10 +1,10 @@
{ stdenv, lib, R, libcxx, xvfb_run, util-linux, Cocoa, Foundation, gettext, gfortran }:
{ stdenv, lib, R, libcxx, xvfb-run, util-linux, Cocoa, Foundation, gettext, gfortran }:
{ name, buildInputs ? [], requireX ? false, ... } @ attrs:
stdenv.mkDerivation ({
buildInputs = buildInputs ++ [R gettext] ++
lib.optionals requireX [util-linux xvfb_run] ++
lib.optionals requireX [util-linux xvfb-run] ++
lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran];
NIX_CFLAGS_COMPILE =
@ -29,7 +29,7 @@ stdenv.mkDerivation ({
rCommand = if requireX then
# Unfortunately, xvfb-run has a race condition even with -a option, so that
# we acquire a lock explicitly.
"flock ${xvfb_run} xvfb-run -a -e xvfb-error R"
"flock ${xvfb-run} xvfb-run -a -e xvfb-error R"
else
"R";

1
pkgs/games/0ad/data.nix
View File

@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
description = "A free, open-source game of ancient warfare -- data files";
homepage = "https://play0ad.com/";
license = licenses.cc-by-sa-30;
maintainers = with maintainers; [ chvp ];
platforms = platforms.linux;
hydraPlatforms = [];
};

11
pkgs/games/0ad/game.nix
View File

@ -2,7 +2,7 @@
, pkg-config, spidermonkey_78, boost, icu, libxml2, libpng, libsodium
, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
, openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2
, gloox, nvidia-texture-tools, zeroad-data
, gloox, nvidia-texture-tools
, withEditor ? true, wxGTK
}:
@ -50,6 +50,8 @@ stdenv.mkDerivation rec {
"-I${fmt.dev}/include"
];
patches = [ ./rootdir_env.patch ];
configurePhase = ''
# Delete shipped libraries which we don't need.
rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey}
@ -62,7 +64,6 @@ stdenv.mkDerivation rec {
${lib.optionalString withEditor "--enable-atlas"} \
--bindir="$out"/bin \
--libdir="$out"/lib/0ad \
--datadir="$out"/share/0ad/data \
--without-tests \
-j $NIX_BUILD_CORES
popd
@ -85,11 +86,6 @@ stdenv.mkDerivation rec {
# Copy l10n data.
install -Dm755 -t $out/share/0ad/data/l10n binaries/data/l10n/*
# Link in game data from package
ln -s ${zeroad-data}/share/0ad/data/config $out/share/0ad/data/config
ln -s ${zeroad-data}/share/0ad/data/mods $out/share/0ad/data/mods
ln -s ${zeroad-data}/share/0ad/data/tools $out/share/0ad/data/tools
# Copy libraries.
install -Dm644 -t $out/lib/0ad binaries/system/*.so
@ -105,6 +101,7 @@ stdenv.mkDerivation rec {
gpl2 lgpl21 mit cc-by-sa-30
licenses.zlib # otherwise masked by pkgs.zlib
];
maintainers = with maintainers; [ chvp ];
platforms = subtractLists platforms.i686 platforms.linux;
};
}

39
pkgs/games/0ad/rootdir_env.patch Normal file
View File

@ -0,0 +1,39 @@
diff --git a/source/ps/GameSetup/Paths.cpp b/source/ps/GameSetup/Paths.cpp
index 474364e..bf084b4 100644
--- a/source/ps/GameSetup/Paths.cpp
+++ b/source/ps/GameSetup/Paths.cpp
@@ -155,32 +155,8 @@ Paths::Paths(const CmdLineArgs& args)
/*static*/ OsPath Paths::Root(const OsPath& argv0)
{
-#if OS_ANDROID
- return OsPath("/sdcard/0ad"); // TODO: this is kind of bogus
-#else
-
- // get full path to executable
- OsPath pathname = sys_ExecutablePathname(); // safe, but requires OS-specific implementation
- if(pathname.empty()) // failed, use argv[0] instead
- {
- errno = 0;
- pathname = wrealpath(argv0);
- if(pathname.empty())
- WARN_IF_ERR(StatusFromErrno());
- }
-
- // make sure it's valid
- if(!FileExists(pathname))
- {
- LOGERROR("Cannot find executable (expected at '%s')", pathname.string8());
- WARN_IF_ERR(StatusFromErrno());
- }
-
- for(size_t i = 0; i < 2; i++) // remove "system/name.exe"
- pathname = pathname.Parent();
- return pathname;
-
-#endif
+ UNUSED2(argv0);
+ return OsPath(getenv("ZEROAD_ROOTDIR"));
}
/*static*/ OsPath Paths::RootData(const OsPath& argv0)

6
pkgs/games/alephone/default.nix
View File

@ -7,12 +7,12 @@ let
self = stdenv.mkDerivation rec {
outputs = [ "out" "icons" ];
pname = "alephone";
version = "1.3.1";
version = "1.4";
src = fetchurl {
url = let date = "20200904";
url = let date = "20210408";
in "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${date}/AlephOne-${date}.tar.bz2";
sha256 = "13ck3mp9qd5pkiq6zwvr744bwvmnqkgj5vpf325sz1mcvnv7l8lh";
sha256 = "sha256-tMwATUhUpo8W2oSWxGSZcAHVkj1PWEvUR/rpMZwWCWA=";
};
nativeBuildInputs = [ pkg-config icoutils ];

10
pkgs/misc/emulators/vbam/default.nix
View File

@ -2,6 +2,7 @@
, cairo
, cmake
, fetchFromGitHub
, fetchpatch
, ffmpeg
, gettext
, libGLU, libGL
@ -46,6 +47,15 @@ stdenv.mkDerivation rec {
"-DENABLE_SDL='true'"
];
patches = [
(fetchpatch {
# https://github.com/visualboyadvance-m/visualboyadvance-m/pull/793
name = "fix-build-SDL-2.0.14.patch";
url = "https://github.com/visualboyadvance-m/visualboyadvance-m/commit/619a5cce683ec4b1d03f08f316ba276d8f8cd824.patch";
sha256 = "099cbzgq4r9g83bvdra8a0swfl1vpfng120wf4q7h6vs0n102rk9";
})
];
meta = with lib; {
description = "A merge of the original Visual Boy Advance forks";
license = licenses.gpl2;

26
pkgs/misc/vscode-extensions/default.nix
View File

@ -1,4 +1,4 @@
{ config, lib, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8 }:
{ config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8 }:
let
inherit (vscode-utils) buildVscodeMarketplaceExtension;
@ -702,9 +702,15 @@ let
ms-vscode-remote.remote-ssh = callPackage ./remote-ssh {};
ms-python.python = callPackage ./python {
extractNuGet = callPackage ./python/extract-nuget.nix { };
};
ms-python.python = let
raw-package = callPackage ./python {
extractNuGet = callPackage ./python/extract-nuget.nix { };
};
in
buildEnv {
name = "vscode-extension-ms-python-python-full";
paths = [ raw-package self.ms-toolsai.jupyter ];
};
msjsdiag.debugger-for-chrome = buildVscodeMarketplaceExtension {
mktplcRef = {
@ -718,6 +724,18 @@ let
};
};
ms-toolsai.jupyter = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "jupyter";
publisher = "ms-toolsai";
version = "2021.5.745244803";
sha256 = "0gjpsp61l8daqa87mpmxcrvsvb0pc2vwg7xbkvwn0f13c1739w9p";
};
meta = {
license = lib.licenses.unfree;
};
};
naumovs.color-highlight = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "color-highlight";

4
pkgs/misc/vscode-extensions/python/default.nix
View File

@ -41,13 +41,13 @@ in vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "python";
publisher = "ms-python";
version = "2020.9.114305";
version = "2021.4.765268190";
};
vsix = fetchurl {
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix";
sha256 = "1vh0wvfvzszc58lw7dbl60knpm5l6rrsghfchhn5dvwyadx4a33h";
sha256 = "0x7dn3vc83mph2gaxgx26bn7g71hqdpp1mpizmd4jqcrknc4d7ci";
};
buildInputs = [

5
pkgs/os-specific/linux/cryptodev/default.nix
View File

@ -1,14 +1,14 @@
{ fetchFromGitHub, lib, stdenv, kernel ? false }:
stdenv.mkDerivation rec {
pname = "cryptodev-linux-1.11";
pname = "cryptodev-linux-1.12";
name = "${pname}-${kernel.version}";
src = fetchFromGitHub {
owner = "cryptodev-linux";
repo = "cryptodev-linux";
rev = pname;
sha256 = "1ky850qiyacq8p3lng7n3w6h3x2clqrz4lkv2cv3psy92mg9pvc9";
sha256 = "sha256-vJQ10rG5FGbeEOqCUmH/pZ0P77kAW/MtUarywbtIyHw=";
};
hardeningDisable = [ "pic" ];
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Device that allows access to Linux kernel cryptographic drivers";
homepage = "http://cryptodev-linux.org/";
maintainers = with lib.maintainers; [ fortuneteller2k ];
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
};

2
pkgs/servers/clickhouse/default.nix
View File

@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
pname = "clickhouse";
version = "20.11.4.13";
broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685
src = fetchFromGitHub {
owner = "ClickHouse";
repo = "ClickHouse";

4
pkgs/servers/matrix-synapse/default.nix
View File

@ -12,11 +12,11 @@ let
in
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.32.2";
version = "1.33.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Biwj/zORBsU8XvpMMlSjR3Nqx0q1LqaSX/vX+UDeXI8=";
sha256 = "sha256-kH5HhkfUL+WzcX/0pK0dV1bI34TpmgRpx3m/UchdAEE=";
};
patches = [

6
pkgs/servers/plex/raw.nix
View File

@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
version = "1.22.2.4282-a97b03fad";
version = "1.23.0.4482-62106842a";
pname = "plexmediaserver";
# Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
sha256 = "01krx6vhk24wm2hikxkfv8m53y8b4yqnkii4j9zf48f1a9hlj2zp";
sha256 = "0i4cfnzlzxh3vwd8kivy0dy6wg102j96v7p3mpivkwj15kjrl01v";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
sha256 = "04wzv15pnd4sn6cy62m8prvsxpxj4sg3q9ahwsrn2cj31vgayg0i";
sha256 = "0yh30712m23hmpqc4b83pbmadgslq72z8lc4prx2kp01n3p5hfkq";
};
outputs = [ "out" "basedb" ];

23
pkgs/tools/archivers/quickbms/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ stdenv, lib, fetchzip, bzip2, lzo, openssl, zlib }:
stdenv.mkDerivation rec {
version = "0.11.0";
pname = "quickbms";
src = fetchzip {
url = "https://aluigi.altervista.org/papers/quickbms-src-${version}.zip";
hash = "sha256-uQKTE36pLO8uhrX794utqaDGUeyqRz6zLCQFA7DYkNc=";
};
buildInputs = [ bzip2 lzo openssl zlib ];
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "Universal script based file extractor and reimporter";
homepage = "https://aluigi.altervista.org/quickbms.htm";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ samuelgrf ];
platforms = platforms.linux;
};
}

6
pkgs/tools/misc/pistol/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "pistol";
version = "0.1.9";
version = "0.2.0";
src = fetchFromGitHub {
owner = "doronbehar";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Q/W+1NvbuSu+QfezJpyeI5r4VlzdAAbOlSfFIT8knJs=";
sha256 = "sha256-c85XF1Glg6A7utPfXOv4LBesJy9+ErE2B+DO243mMhg=";
};
vendorSha256 = "sha256-oXt2nZ9lcAiI9ZQtKuQrXOXDfqx3Ucvh/K6g7SScd2Q=";
vendorSha256 = "sha256-n98cjXsgg2w3shbZPnk3g7mBbzV5Tc3jd9ZtiRk1KUM=";
doCheck = false;

4
pkgs/tools/misc/xvfb-run/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, makeWrapper, xorgserver, getopt
, xauth, util-linux, which, fontsConf, gawk, coreutils }:
let
xvfb_run = fetchurl {
xvfb-run = fetchurl {
name = "xvfb-run";
# https://git.archlinux.org/svntogit/packages.git/?h=packages/xorg-server
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server&id=9cb733cefa92af3fca608fb051d5251160c9bbff";
@ -13,7 +13,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
mkdir -p $out/bin
cp ${xvfb_run} $out/bin/xvfb-run
cp ${xvfb-run} $out/bin/xvfb-run
chmod a+x $out/bin/xvfb-run
patchShebangs $out/bin/xvfb-run

6
pkgs/tools/typesetting/tex/texlive/bin.nix
View File

@ -185,6 +185,12 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
mkdir -p "$path" && cd "$path"
"../../../$path/configure" $configureFlags $extraConfig
if [[ "$path" =~ "libs/pplib" ]]; then
# TODO: revert for texlive 2022
# ../../../texk/web2c/luatexdir/luamd5/md5lib.c:197:10: fatal error: 'utilsha.h' file not found
make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
fi
)
done
'';

1
pkgs/top-level/aliases.nix
View File

@ -872,6 +872,7 @@ mapAliases ({
xlibs = xorg; # added 2015-09
xpraGtk3 = xpra; # added 2018-09-13
xv = xxv; # added 2020-02-22
xvfb_run = xvfb-run; # added 2021-05-07
yacc = bison; # moved from top-level 2021-03-14
youtubeDL = youtube-dl; # added 2014-10-26
ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead";

10
pkgs/top-level/all-packages.nix
View File

@ -7849,6 +7849,8 @@ in
qnial = callPackage ../development/interpreters/qnial { };
quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { };
ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { };
q-text-as-data = callPackage ../tools/misc/q-text-as-data { };
@ -9753,7 +9755,7 @@ in
xxv = callPackage ../tools/misc/xxv {};
xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; };
xvfb-run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; };
xvkbd = callPackage ../tools/X11/xvkbd {};
@ -11663,7 +11665,9 @@ in
urn = callPackage ../development/compilers/urn { };
urweb = callPackage ../development/compilers/urweb { };
urweb = callPackage ../development/compilers/urweb {
icu = icu67;
};
vlang = callPackage ../development/compilers/vlang { };
@ -27562,7 +27566,7 @@ in
autoreconfHook = buildPackages.autoreconfHook269;
};
ethabi = callPackage ../applications/blockchains/ethabi.nix { };
ethabi = callPackage ../applications/blockchains/ethabi { };
pycoin = with python3Packages; toPythonApplication pycoin;

2
pkgs/top-level/perl-packages.nix
View File

@ -9248,7 +9248,7 @@ let
propagatedBuildInputs = [ Readonly Gtk3 ];
checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ];
checkPhase = ''
${pkgs.xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \
${pkgs.xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \
make test
'';
meta = {

12
pkgs/top-level/python-packages.nix
View File

@ -1239,6 +1239,8 @@ in {
cassandra-driver = callPackage ../development/python-modules/cassandra-driver { };
castepxbin = callPackage ../development/python-modules/castepxbin { };
casttube = callPackage ../development/python-modules/casttube { };
catalogue = callPackage ../development/python-modules/catalogue { };
@ -1735,8 +1737,6 @@ in {
debugpy = callPackage ../development/python-modules/debugpy { };
debut = callPackage ../development/python-modules/debut { };
decorator = callPackage ../development/python-modules/decorator { };
decopatch = callPackage ../development/python-modules/decopatch { };
@ -4829,6 +4829,8 @@ in {
pathvalidate = callPackage ../development/python-modules/pathvalidate { };
pathy = callPackage ../development/python-modules/pathy/default.nix { };
patiencediff = callPackage ../development/python-modules/patiencediff { };
patool = callPackage ../development/python-modules/patool { };
@ -5872,7 +5874,9 @@ in {
phonemizer = callPackage ../development/python-modules/phonemizer { };
pyopencl = callPackage ../development/python-modules/pyopencl { };
pyopencl = callPackage ../development/python-modules/pyopencl {
mesa_drivers = pkgs.mesa.drivers;
};
pyopengl = callPackage ../development/python-modules/pyopengl { };
@ -7619,6 +7623,8 @@ in {
spacy = callPackage ../development/python-modules/spacy { };
spacy-legacy = callPackage ../development/python-modules/spacy/legacy.nix { };
spacy_models = callPackage ../development/python-modules/spacy/models.nix { };
spake2 = callPackage ../development/python-modules/spake2 { };