Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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" ];
|
||||
|
||||
@@ -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"
|
||||
+8
-6
@@ -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;
|
||||
};
|
||||
}
|
||||
@@ -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,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; [
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -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
|
||||
'';
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 = ''
|
||||
|
||||
@@ -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,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
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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}"
|
||||
|
||||
@@ -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" ];
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user