Merge branch 'master' into haskell-updates

This commit is contained in:
Malte Brandy 2021-05-09 02:18:56 +02:00
commit e60afba5d1
No known key found for this signature in database
GPG Key ID: 226A2D41EF5378C9
204 changed files with 2331 additions and 540 deletions

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 # based on update.nix
# nix-build build.nix --argstr maintainer <yourname> # 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 let
pkgs = import ./../../default.nix {}; pkgs = import ./../../default.nix (removeAttrs args [ "maintainer" ]);
maintainer_ = pkgs.lib.maintainers.${maintainer}; maintainer_ = pkgs.lib.maintainers.${maintainer};
packagesWith = cond: return: set: packagesWith = cond: return: set:
(pkgs.lib.flatten (pkgs.lib.flatten

View File

@ -48,6 +48,7 @@ let
in in
pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {
name = "nixpkgs-update-script"; name = "nixpkgs-update-script";
buildInputs = [ pkgs.hydra-check ];
buildCommand = '' buildCommand = ''
echo "" echo ""
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"

View File

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

View File

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

View File

@ -102,8 +102,8 @@ in {
freeformType = let freeformType = let
validSettingsPrimitiveTypes = oneOf [ int str bool float ]; validSettingsPrimitiveTypes = oneOf [ int str bool float ];
validSettingsTypes = oneOf [ validSettingsPrimitiveTypes (listOf validSettingsPrimitiveTypes) ]; validSettingsTypes = oneOf [ validSettingsPrimitiveTypes (listOf validSettingsPrimitiveTypes) ];
settingsType = (attrsOf validSettingsTypes); settingsType = oneOf [ str (attrsOf validSettingsTypes) ];
in attrsOf (oneOf [ string settingsType (listOf settingsType) ]) in attrsOf (oneOf [ settingsType (listOf settingsType) ])
// { description = '' // { description = ''
unbound.conf configuration type. The format consist of an attribute unbound.conf configuration type. The format consist of an attribute
set of settings. Each settings can be either one value, a list of set of settings. Each settings can be either one value, a list of

View File

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

View File

@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
{ {
name = "docker-tools-overlay"; name = "docker-tools-overlay";
meta = with pkgs.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ lnl7 ]; maintainers = [ lnl7 roberth ];
}; };
nodes = { nodes = {
@ -30,4 +30,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
# drw------- 99 0 0 100 Apr 14 11:36 /nix/store # 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") 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;
}) })

View File

@ -3,7 +3,7 @@
import ./make-test-python.nix ({ pkgs, ... }: { import ./make-test-python.nix ({ pkgs, ... }: {
name = "docker-tools"; name = "docker-tools";
meta = with pkgs.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ lnl7 ]; maintainers = [ lnl7 roberth ];
}; };
nodes = { 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$'" "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;
}) })

View File

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

View File

@ -1,5 +1,6 @@
{ lib, stdenv { lib, stdenv
, fetchurl , fetchurl
, fetchpatch
, avahi , avahi
, bluez , bluez
, boost , boost
@ -41,13 +42,22 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "guitarix"; pname = "guitarix";
version = "0.41.0"; version = "0.42.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; 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 = [ nativeBuildInputs = [
gettext gettext
hicolor-icon-theme hicolor-icon-theme

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome, gtk3, gdk-pixbuf, librsvg, { 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, gst_all_1, withGstPlugins ? true,
xineBackend ? false, xine-lib, xineBackend ? false, xine-lib,
withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false, withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false,
@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = [ wrapGAppsHook gettext ]; 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 ] 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; ++ (if xineBackend then [ xine-lib ] else with gst_all_1;

View File

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

View File

@ -2,6 +2,7 @@
, fetchFromGitHub , fetchFromGitHub
, openssl , openssl
, boost , boost
, libb2
, libevent , libevent
, autoreconfHook , autoreconfHook
, db4 , db4
@ -21,13 +22,13 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bitcoin" + toString (optional (!withGui) "d") + "-gold"; pname = "bitcoin" + toString (optional (!withGui) "d") + "-gold";
version = "0.15.2"; version = "0.17.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "BTCGPU"; owner = "BTCGPU";
repo = "BTCGPU"; repo = "BTCGPU";
rev = "v${version}"; rev = "v${version}";
sha256 = "0grd1cd8d2nsrxl27la85kcan09z73fn70ncr9km4iccaj5pg12h"; sha256 = "sha256-1tFoUNsCPJkHSmNRl5gE3n2EQD6RZSry1zIM5hiTzEI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -45,6 +46,7 @@ stdenv.mkDerivation rec {
db4 db4
zeromq zeromq
libsodium libsodium
libb2
] ++ optionals withGui [ ] ++ optionals withGui [
qtbase qtbase
qttools qttools

View File

@ -16,6 +16,7 @@
, python3 , python3
, qrencode , qrencode
, libevent , libevent
, nixosTests
, withGui , withGui
, withWallet ? true , withWallet ? true
}: }:
@ -81,6 +82,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.tests = {
smoke-test = nixosTests.bitcoind;
};
meta = { meta = {
description = "Peer-to-peer electronic cash system"; description = "Peer-to-peer electronic cash system";
longDescription = '' longDescription = ''

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"

View File

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

View File

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

View File

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

View File

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

View File

@ -20,13 +20,13 @@
stdenv.mkDerivation rec{ stdenv.mkDerivation rec{
pname = "corectrl"; pname = "corectrl";
version = "1.1.1"; version = "1.1.2";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "corectrl"; owner = "corectrl";
repo = "corectrl"; repo = "corectrl";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-YQDrxPqCa3OzNKd3UiAffqqvOrgbXmDFJGjYPetolyY="; sha256 = "sha256-hKYZkKQOvNu2qDSOq1cjoiLwwOvEqdJfqGG5p3Vhkhs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

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 { stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1n3i960b458172mc3pkq7m9dn5qxry6fms3c3k06v27cjp5whsyf"; 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 ]; buildInputs = [ libintl libiconv json_c ];
propagatedBuildInputs = [ glib gtk ]; propagatedBuildInputs = [ glib gtk ];

View File

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

View File

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

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 }: , xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -21,6 +21,14 @@ stdenv.mkDerivation {
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good 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 = '' postPatch = ''
sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure
''; '';

View File

@ -1,17 +1,17 @@
{ lib, rustPlatform, fetchFromGitHub }: { lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
name = "xplr"; pname = "xplr";
version = "0.5.12"; version = "0.7.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sayanarijit"; owner = "sayanarijit";
repo = name; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0dmqa56sxyvrq03rpf9yczp75zk44s79ilz6kbykdghp0d9lyldf"; sha256 = "1mqxnahhbf394niyc8i6gk2y3i7lj9cj71k460r58cmir5fch82m";
}; };
cargoSha256 = "1mb1rfax91cbi2wvshl8jsfykx9kfwff8fkqa7rc4plqxnz0qxkx"; cargoSha256 = "1dfcmkfclkq5b103jl98yalcl3mnvsq8xpkdasf72d3wgzarih16";
meta = with lib; { meta = with lib; {
description = "A hackable, minimal, fast TUI file explorer"; description = "A hackable, minimal, fast TUI file explorer";

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, coreutils }: { lib, stdenv, fetchFromGitHub, coreutils, nixosTests }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "3proxy"; pname = "3proxy";
@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
"DESTDIR=${placeholder "out"}" "DESTDIR=${placeholder "out"}"
]; ];
passthru.tests = {
smoke-test = nixosTests._3proxy;
};
meta = with lib; { meta = with lib; {
description = "Tiny free proxy server"; description = "Tiny free proxy server";
homepage = "https://github.com/z3APA3A/3proxy"; homepage = "https://github.com/z3APA3A/3proxy";

View File

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

View File

@ -1,4 +1,5 @@
{ lib, stdenv { lib
, stdenv
, fetchFromGitHub , fetchFromGitHub
, glib , glib
, gtk3 , gtk3
@ -22,14 +23,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.3.2"; version = "1.4.1";
pname = "cawbird"; pname = "cawbird";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "IBBoard"; owner = "IBBoard";
repo = "cawbird"; repo = "cawbird";
rev = "v${version}"; rev = "v${version}";
sha256 = "1baw3h5wq2ib4bnphazq7n9c9wc94g0n6v4y5kg71n1dir0c3jkh"; sha256 = "0lmrgcj1ky1vhzynl36k6ba3ws089x4qdrnkjk3lbr334kicx9na";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -69,11 +70,18 @@ stdenv.mkDerivation rec {
patchShebangs data/meson_post_install.py patchShebangs data/meson_post_install.py
''; '';
# supply Twitter API keys
# use default keys supplied by upstream, see https://github.com/IBBoard/cawbird/blob/master/README.md#preparation
mesonFlags = [
"-Dconsumer_key_base64=VmY5dG9yRFcyWk93MzJEZmhVdEk5Y3NMOA=="
"-Dconsumer_secret_base64=MThCRXIxbWRESDQ2Y0podzVtVU13SGUyVGlCRXhPb3BFRHhGYlB6ZkpybG5GdXZaSjI="
];
meta = with lib; { meta = with lib; {
description = "Native GTK Twitter client for the Linux desktop"; description = "Native GTK Twitter client for the Linux desktop";
longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird."; longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird.";
homepage = "https://ibboard.co.uk/cawbird/"; homepage = "https://ibboard.co.uk/cawbird/";
license = licenses.gpl3; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with lib.maintainers; [ jonafato schmittlauch ]; maintainers = with lib.maintainers; [ jonafato schmittlauch ];
}; };

View File

@ -1,7 +1,7 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let let
version = "0.13.2"; version = "0.13.3";
manifests = fetchzip { manifests = fetchzip {
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
@ -19,10 +19,10 @@ buildGoModule rec {
owner = "fluxcd"; owner = "fluxcd";
repo = "flux2"; repo = "flux2";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-yWcoHUHEiRp4YxTDxi+inJkpb8dnTVTwSO3MgFyhvps="; sha256 = "sha256-RaQOefVqDPHvTF1qMtgAFNpA1Gx7Vo2JKiwteePsGyo=";
}; };
vendorSha256 = "sha256-hSnTM89s3R7UDn1gLlb1gu6rhTPqVKJpWKCz1SDyfmg="; vendorSha256 = "sha256-GR40BgNMHi3TXVQVN1FaPNVi0HXYVm3vbg4NTXfYBes=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "helmfile"; pname = "helmfile";
version = "0.138.7"; version = "0.139.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "roboll"; owner = "roboll";
repo = "helmfile"; repo = "helmfile";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-LFNsSd+S+mQiTk7bCnSD/Kp/D0Jefxo80eRsGkStBhs="; sha256 = "sha256-bwhiua+KQdt9fyvM4TeS6Mm7EQB9K2L04FPhGS380xI=";
}; };
vendorSha256 = "sha256-WlV6moJymQ7VyZXXuViCNN1WP4NzBUszavxpKjQR8to="; vendorSha256 = "sha256-Qpou4e1My/obIHL/4/IEUml0F82atIwPGZX5+vpvk0k=";
doCheck = false; doCheck = false;

View File

@ -1,6 +1,6 @@
{ lib, buildGoPackage, fetchFromGitHub, ... }: { lib, buildGoPackage, fetchFromGitHub, ... }:
let version = "0.19.0"; in let version = "0.19.1"; in
buildGoPackage { buildGoPackage {
pname = "kubecfg"; pname = "kubecfg";
@ -10,7 +10,7 @@ buildGoPackage {
owner = "bitnami"; owner = "bitnami";
repo = "kubecfg"; repo = "kubecfg";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-G3yLpo/6hv6t3i6b/KMgoZqltyGDddg/SsNPF8hNeUg="; sha256 = "sha256-makRYWBtOjvuv7dAY1vNh1Nxv+nETVlaFh1C3oiojUo=";
}; };
goPackagePath = "github.com/bitnami/kubecfg"; goPackagePath = "github.com/bitnami/kubecfg";

View File

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

View File

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

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, libowfat, zlib }: { lib, stdenv, fetchgit, libowfat, zlib, nixosTests }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "opentracker-2018-05-26"; name = "opentracker-2018-05-26";
@ -23,6 +23,10 @@ stdenv.mkDerivation {
runHook postInstall runHook postInstall
''; '';
passthru.tests = {
bittorrent-integration = nixosTests.bittorrent;
};
meta = with lib; { meta = with lib; {
homepage = "https://erdgeist.org/arts/software/opentracker/"; homepage = "https://erdgeist.org/arts/software/opentracker/";
license = licenses.beerware; license = licenses.beerware;

View File

@ -17,6 +17,7 @@
, wrapGAppsHook , wrapGAppsHook
, enableQt ? false , enableQt ? false
, qt5 , qt5
, nixosTests
, enableSystemd ? stdenv.isLinux , enableSystemd ? stdenv.isLinux
, enableDaemon ? true , enableDaemon ? true
, enableCli ? true , enableCli ? true
@ -74,6 +75,10 @@ in stdenv.mkDerivation {
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation";
passthru.tests = {
smoke-test = nixosTests.bittorrent;
};
meta = { meta = {
description = "A fast, easy and free BitTorrent client"; description = "A fast, easy and free BitTorrent client";
longDescription = '' longDescription = ''

View File

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

View File

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

View File

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

View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gretl"; pname = "gretl";
version = "2021a"; version = "2021b";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz"; url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz";
sha256 = "sha256-BDaTv6PORiBnsEaU7uXJIKuxTqIgpY44vUmSViyME0A="; sha256 = "sha256-3KSAA0UPx3cqMXf/G5nrlCfLjWcDiGtzvJe/syRyE6c=";
}; };
buildInputs = [ buildInputs = [

View File

@ -14,6 +14,7 @@
, withpcre2 ? true , withpcre2 ? true
, sendEmailSupport , sendEmailSupport
, darwin , darwin
, nixosTests
, withLibsecret ? false , withLibsecret ? false
, pkg-config, glib, libsecret , pkg-config, glib, libsecret
, gzip # needed at runtime by gitweb.cgi , gzip # needed at runtime by gitweb.cgi
@ -334,6 +335,9 @@ stdenv.mkDerivation {
stripDebugList = [ "lib" "libexec" "bin" "share/git/contrib/credential/libsecret" ]; stripDebugList = [ "lib" "libexec" "bin" "share/git/contrib/credential/libsecret" ];
passthru.tests = {
buildbot-integration = nixosTests.buildbot;
};
meta = { meta = {
homepage = "https://git-scm.com/"; homepage = "https://git-scm.com/";

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "droidcam"; pname = "droidcam";
version = "1.7.2"; version = "1.7.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aramg"; owner = "aramg";
repo = "droidcam"; repo = "droidcam";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Ny/PJu+ifs9hQRDUv1pONBb6fKJzoiNtjPOFc4veU8c="; sha256 = "sha256-Ok8FJweSzmewjYzfBJQ28xGHKK/Y32ng1hOCPVwc8eU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

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

View File

@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
version = "4.9.3"; version = "4.9.3";
src = fetchurl { src = fetchurl {
url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; url = "https://web.archive.org/web/20210326102451/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
sha256 = "sha256-xgdCjo2RLp+EtUTfSiys7PURhnC00R9IOLPtz3427pA="; sha256 = "sha256-T+y8k757/qFCVOCc/SNc7a+KmyscPlowubNQYzMr8jY=";
}; };
unpackPhase = "tar xvf $src"; unpackPhase = "tar xvf $src";

View File

@ -3,13 +3,13 @@
buildKodiAddon rec { buildKodiAddon rec {
pname = "netflix"; pname = "netflix";
namespace = "plugin.video.netflix"; namespace = "plugin.video.netflix";
version = "1.15.0"; version = "1.15.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "CastagnaIT"; owner = "CastagnaIT";
repo = namespace; repo = namespace;
rev = "v${version}"; rev = "v${version}";
sha256 = "1jibzzm8viqpanby6lqxpb95gw5hw3lfsw4jasjskiinbf8n469k"; sha256 = "0c5cdi6s76vg2gyxzf0ylisxai1ii8vi6h4q4mznpfmplfdp667v";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -4,14 +4,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "kooha"; pname = "kooha";
version = "1.1.2"; version = "1.1.3";
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SeaDve"; owner = "SeaDve";
repo = "Kooha"; repo = "Kooha";
rev = "v${version}"; rev = "v${version}";
sha256 = "0jr55b39py9c8dc9rihn7ffx2yh71qqdk6pfn3c2ciiajjs74l17"; sha256 = "14lrx6wplvlk3cg3wij88h4ydp3m69pw7lvvzrq3j9qnh431bs36";
}; };
buildInputs = [ buildInputs = [

View File

@ -0,0 +1,22 @@
{ stdenv, lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "prism";
version = "0.1.1";
src = fetchFromGitHub {
owner = "muesli";
repo = pname;
rev = "v${version}";
sha256 = "0q7q7aj3fm45bnx6hgl9c1ll8na16x6p7qapr0c4a6dhxwd7n511";
};
vendorSha256 = "1mkd1s9zgzy9agy2rjjk8wfdga7nzv9cmwgiarfi4xrqzj4mbaxq";
meta = with lib; {
description = "An RTMP stream recaster/splitter";
homepage = "https://github.com/muesli/prism";
license = licenses.mit;
maintainers = with maintainers; [ paperdigits ];
};
}

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

View File

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

View File

@ -10,13 +10,13 @@
buildGoPackage rec { buildGoPackage rec {
pname = "containerd"; pname = "containerd";
version = "1.4.4"; version = "1.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containerd"; owner = "containerd";
repo = "containerd"; repo = "containerd";
rev = "v${version}"; rev = "v${version}";
sha256 = "0qjbfj1dw6pykxhh8zahcxlgpyjzgnrngk5vjaf34akwyan8nrxb"; sha256 = "sha256-dUn9lvDLoljq5JPFvUdJ8te0VHkCs9Y9Em2mcq5mHvY=";
}; };
goPackagePath = "github.com/containerd/containerd"; goPackagePath = "github.com/containerd/containerd";

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-shell-extension-disable-unredirect"; pname = "gnome-shell-extension-disable-unredirect";
version = "unstable-2021-01-17"; version = "unstable-2021-04-13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kazysmaster"; owner = "kazysmaster";
repo = "gnome-shell-extension-disable-unredirect"; repo = "gnome-shell-extension-disable-unredirect";
rev = "2ecb2f489ea3316b77d04f03a0c885f322c67e79"; rev = "2a4c0e6a7a7a5f1aad9907ee2cf43d0725e10c19";
sha256 = "1rjyrg8qya0asndxr7189a9npww0rcxk02wkxrxjy7fdp5m89p7y"; sha256 = "06hbyy20xz0bvzg0vs5w4092nyfpg372c86cdm1akcjm72m5sim9";
}; };
uuid = "unredirect@vaina.lt"; uuid = "unredirect@vaina.lt";

View File

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

View File

@ -1859,4 +1859,6 @@ self: super: {
}; };
}; };
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 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

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.

View File

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

View File

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

View File

@ -7,7 +7,7 @@
, gobject-introspection , gobject-introspection
, gnome , gnome
, dbus , dbus
, xvfb_run , xvfb-run
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
doCheck = stdenv.isLinux; doCheck = stdenv.isLinux;
checkPhase = '' checkPhase = ''
export NO_AT_BRIDGE=1 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 \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \
meson test --print-errorlogs meson test --print-errorlogs
''; '';

View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "apache-activemq"; pname = "apache-activemq";
version = "5.16.1"; version = "5.16.2";
src = fetchurl { src = fetchurl {
sha256 = "sha256-Q9PzqJC/+uhcbxAC6c+VD8wf0X8/XlXcO4XTnQni4yM="; sha256 = "sha256-IS/soe5Lx1C+/UWnNcv+8AwMmu5FHvURbpkTMMGrEFs=";
url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
}; };

View File

@ -1,5 +1,6 @@
{ fetchurl, fetchpatch, lib, stdenv, pkg-config, libdaemon, dbus, perlPackages { fetchurl, fetchpatch, lib, stdenv, pkg-config, libdaemon, dbus, perlPackages
, expat, gettext, intltool, glib, libiconv, writeShellScriptBin, libevent , expat, gettext, intltool, glib, libiconv, writeShellScriptBin, libevent
, nixosTests
, gtk3Support ? false, gtk3 ? null , gtk3Support ? false, gtk3 ? null
, qt4 ? null , qt4 ? null
, qt4Support ? false , qt4Support ? false
@ -77,6 +78,11 @@ stdenv.mkDerivation rec {
ln -s avahi-compat-howl.pc $out/lib/pkgconfig/howl.pc ln -s avahi-compat-howl.pc $out/lib/pkgconfig/howl.pc
*/ */
passthru.tests = {
smoke-test = nixosTests.avahi;
smoke-test-resolved = nixosTests.avahi-with-resolved;
};
meta = with lib; { meta = with lib; {
description = "mDNS/DNS-SD implementation"; description = "mDNS/DNS-SD implementation";
homepage = "http://avahi.org"; homepage = "http://avahi.org";

View File

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

View File

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

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala { 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 { stdenv.mkDerivation rec {
pname = "gtksourceview"; pname = "gtksourceview";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config intltool perl gobject-introspection vala ]; nativeBuildInputs = [ pkg-config intltool perl gobject-introspection vala ];
checkInputs = [ xvfb_run dbus ]; checkInputs = [ xvfb-run dbus ];
buildInputs = [ atk cairo glib pango libxml2 gettext ]; buildInputs = [ atk cairo glib pango libxml2 gettext ];

View File

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

View File

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

View File

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

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2 { 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 { stdenv.mkDerivation rec {
pname = "libdazzle"; pname = "libdazzle";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "19abrrjsyjhhl1xflnb0likb9wwzz78fa1mk2b064rpscmz9mafv"; 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 ]; buildInputs = [ glib gtk3 ];
mesonFlags = [ mesonFlags = [

View File

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

View File

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

View File

@ -18,7 +18,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libmodulemd"; pname = "libmodulemd";
version = "2.12.0"; version = "2.12.1";
outputs = [ "bin" "out" "dev" "devdoc" "man" "py" ]; outputs = [ "bin" "out" "dev" "devdoc" "man" "py" ];
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "fedora-modularity"; owner = "fedora-modularity";
repo = pname; repo = pname;
rev = "${pname}-${version}"; rev = "${pname}-${version}";
sha256 = "1mq9as98q4wyka404f8xwfc44cn5j4bsk0fch5pf07v81sagc1q9"; sha256 = "sha256-Relj14uG+dp9r5xWEbw/eAmlUJJ/kRwlPclcWGQxoJg=";
}; };
patches = [ patches = [

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3 { lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3
, docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala , 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 { stdenv.mkDerivation rec {
pname = "libsecret"; pname = "libsecret";
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
installCheckInputs = [ 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 # needs to run after install because typelibs point to absolute paths

View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: { lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.7.17"; version = "0.7.19";
pname = "libsolv"; pname = "libsolv";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openSUSE"; owner = "openSUSE";
repo = "libsolv"; repo = "libsolv";
rev = version; rev = version;
sha256 = "sha256-LPOS+yDwNpyO9tkFoIy4SCQymytOGB26Pfyd/EFEYnc="; sha256 = "sha256-AN4cgpMBqTtK04CU89Yqd1ZfWyPrCociPd3XKdVONMU=";
}; };
cmakeFlags = [ cmakeFlags = [

View File

@ -10,11 +10,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libwpe"; pname = "libwpe";
version = "1.8.0"; version = "1.10.0";
src = fetchurl { src = fetchurl {
url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz";
sha256 = "sha256-pvAKfQkcvU21f+fuO0wSxjUJIdZU7XmBKACibIiEgdI="; sha256 = "sha256-JBXicNReNZXtQFK8EF9zN0TcLTZ34S/0qDHlAphBCE0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libxlsxwriter"; pname = "libxlsxwriter";
version = "1.0.3"; version = "1.0.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jmcnamara"; owner = "jmcnamara";
repo = "libxlsxwriter"; repo = "libxlsxwriter";
rev = "RELEASE_${version}"; rev = "RELEASE_${version}";
sha256 = "14c5rgx87nhzasr0j7mcfr1w7ifz0gmdiqy2xq59di5xvcdrpxpv"; sha256 = "0k0km5d4xs6z98nqczvdkqwhhc5izqs82ciifx2l5wcbcdxb4r0k";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -1,9 +1,9 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "matio-1.5.20"; name = "matio-1.5.21";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/matio/${name}.tar.gz"; url = "mirror://sourceforge/matio/${name}.tar.gz";
sha256 = "sha256-XR9yofUav2qc0j6qgS+xe4YQlwWQlfSMdoxINcWqJZg="; sha256 = "sha256-IYCRd+VYOefJTa2nRO5Vwd6n11fdqriWBXdtUBIvsGU=";
}; };
meta = with lib; { meta = with lib; {

View File

@ -42,7 +42,7 @@ let
self = stdenv.mkDerivation rec { self = stdenv.mkDerivation rec {
pname = "pipewire"; pname = "pipewire";
version = "0.3.26"; version = "0.3.27";
outputs = [ outputs = [
"out" "out"
@ -60,7 +60,7 @@ let
owner = "pipewire"; owner = "pipewire";
repo = "pipewire"; repo = "pipewire";
rev = version; rev = version;
sha256 = "sha256-s9+70XXMN4K3yDVwIu+L15gL6rFlpRNVQpeekZQOEec="; sha256 = "sha256-GfcMODQWtcahBvXnZ98/PKIm4pkqLaz09oOy7zQR4IA=";
}; };
patches = [ patches = [

View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchurl
, fetchpatch
, aalib , aalib
, alsaLib , alsaLib
, ffmpeg , ffmpeg
@ -16,6 +15,7 @@
, libtheora , libtheora
, libv4l , libv4l
, libvorbis , libvorbis
, ncurses
, perl , perl
, pkg-config , pkg-config
, speex , speex
@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
libtheora libtheora
libv4l libv4l
libvorbis libvorbis
ncurses
perl perl
speex speex
vcdimager vcdimager
@ -64,18 +65,10 @@ stdenv.mkDerivation rec {
libxcb libxcb
]); ]);
patches = [ enableParallelBuilding = true;
# 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=";
})
];
NIX_LDFLAGS = "-lxcb-shm"; NIX_LDFLAGS = "-lxcb-shm";
enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
homepage = "http://www.xinehq.de/"; homepage = "http://www.xinehq.de/";

View File

@ -1,4 +1,4 @@
{ lib, menhir, easy-format, fetchurl, buildDunePackage, which, re }: { lib, menhir, easy-format, fetchurl, buildDunePackage, which, re, nixosTests }:
buildDunePackage rec { buildDunePackage rec {
pname = "atd"; pname = "atd";
@ -18,6 +18,10 @@ buildDunePackage rec {
doCheck = true; doCheck = true;
passthru.tests = {
smoke-test = nixosTests.atd;
};
meta = with lib; { meta = with lib; {
homepage = "https://github.com/mjambon/atd"; homepage = "https://github.com/mjambon/atd";
description = "Syntax for cross-language type definitions"; description = "Syntax for cross-language type definitions";

View File

@ -5,6 +5,7 @@
, markdown , markdown
, docutils , docutils
, pygments , pygments
, pyyaml
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -16,7 +17,7 @@ buildPythonPackage rec {
sha256 = "e309d79dde0935576ce1def6752f2127a12e2c2ea2ae8b0c69f99ff8bc12181d"; sha256 = "e309d79dde0935576ce1def6752f2127a12e2c2ea2ae8b0c69f99ff8bc12181d";
}; };
checkInputs = [ markdown docutils pygments ]; checkInputs = [ markdown docutils pygments pyyaml ];
propagatedBuildInputs = [ python-markdown-math ]; propagatedBuildInputs = [ python-markdown-math ];
meta = { meta = {

View File

@ -0,0 +1,42 @@
{ lib
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, psycopg2
, pythonOlder
}:
buildPythonPackage rec {
pname = "aiopg";
version = "1.2.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "aio-libs";
repo = pname;
rev = "v${version}";
sha256 = "0c6s2p1fjbdk1ygpl6a1s1rbnsk8gw9kj99pf98nxhb9j3iahas4";
};
propagatedBuildInputs = [
async-timeout
psycopg2
];
postPatch = ''
substituteInPlace setup.py \
--replace "psycopg2-binary" "psycopg2"
'';
# Tests requires a PostgreSQL Docker instance
doCheck = false;
pythonImportsCheck = [ "aiopg" ];
meta = with lib; {
description = "Python library for accessing a PostgreSQL database";
homepage = "https://aiopg.readthedocs.io/";
license = with licenses; [ bsd2 ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,64 @@
{ lib
, buildPythonPackage
, docopt
, fetchFromGitHub
, hypothesis
, passlib
, poetry-core
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, pyyaml
, transitions
, websockets
}:
buildPythonPackage rec {
pname = "amqtt";
version = "0.10.0-alpha.3";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Yakifo";
repo = pname;
rev = "v${version}";
sha256 = "0wz85ykjgi2174qcdgpakmc4m0p96v62az7pvc9hyallq1v1k4n6";
};
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [
docopt
passlib
pyyaml
transitions
websockets
];
checkInputs = [
hypothesis
pytest-asyncio
pytestCheckHook
];
disabledTestPaths = [
# Test are not ported from hbmqtt yet
"tests/test_cli.py"
"tests/test_client.py"
];
disabledTests = [
# Requires network access
"test_connect_tcp"
];
pythonImportsCheck = [ "amqtt" ];
meta = with lib; {
description = "Python MQTT client and broker implementation";
homepage = "https://amqtt.readthedocs.io/";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -4,11 +4,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "autopep8"; pname = "autopep8";
version = "1.5.6"; version = "1.5.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "5454e6e9a3d02aae38f866eec0d9a7de4ab9f93c10a273fb0340f3d6d09f7514"; sha256 = "276ced7e9e3cb22e5d7c14748384a5cf5d9002257c0ed50c0e075b68011bb6d0";
}; };
propagatedBuildInputs = [ pycodestyle toml ]; propagatedBuildInputs = [ pycodestyle toml ];

View File

@ -0,0 +1,39 @@
{ lib, buildPythonPackage, fetchFromGitHub
, pythonOlder
, importlib-resources
, hypothesis
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "backports-zoneinfo";
version = "0.2.1";
src = fetchFromGitHub {
owner = "pganssle";
repo = "zoneinfo";
rev = version;
sha256 = "sha256-00xdDOVdDanfsjQTd3yjMN2RFGel4cWRrAA3CvSnl24=";
};
propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [
importlib-resources
];
pythonImportsCheck = [ "backports.zoneinfo" ];
checkInputs = [
hypothesis
pytestCheckHook
];
# unfortunately /etc/zoneinfo doesn't exist in sandbox, and many tests fail
doCheck = false;
meta = with lib; {
description = "Backport of the standard library module zoneinfo";
homepage = "https://github.com/pganssle/zoneinfo";
license = licenses.asl20;
maintainers = with maintainers; [ jonringer ];
};
}

View File

@ -22,6 +22,12 @@ buildPythonPackage rec {
url = "https://github.com/DanielStutzbach/blist/commit/2dc1ec28ed68611fcec9ac1c68070c782d6b4b4e.patch"; url = "https://github.com/DanielStutzbach/blist/commit/2dc1ec28ed68611fcec9ac1c68070c782d6b4b4e.patch";
sha256 = "0ma0z6ga80w3wzh3sidwd8ckfbgx4j1y7cc29q6j9ddrvxpf276y"; sha256 = "0ma0z6ga80w3wzh3sidwd8ckfbgx4j1y7cc29q6j9ddrvxpf276y";
}) })
# Fixes compatibility for Python 3.9 https://github.com/DanielStutzbach/blist/pull/91
(fetchpatch {
url = "https://github.com/DanielStutzbach/blist/pull/91/commits/e63514f805e42dc6a5708e629e4153d91bc90bff.patch";
sha256 = "1prx8znk7008v4ky7q2lx0pi6hzqd4kxgfdwbsr4zylwbrdqvsga";
})
]; ];
meta = with lib; { meta = with lib; {

View File

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, buildbot, setuptoolsTrial, mock, twisted, { lib, buildPythonPackage, fetchPypi, buildbot, setuptoolsTrial, mock, twisted,
future, coreutils }: future, coreutils, nixosTests }:
buildPythonPackage (rec { buildPythonPackage (rec {
pname = "buildbot-worker"; pname = "buildbot-worker";
@ -19,6 +19,10 @@ buildPythonPackage (rec {
--replace /usr/bin/tail "${coreutils}/bin/tail" --replace /usr/bin/tail "${coreutils}/bin/tail"
''; '';
passthru.tests = {
smoke-test = nixosTests.buildbot;
};
meta = with lib; { meta = with lib; {
homepage = "https://buildbot.net/"; homepage = "https://buildbot.net/";
description = "Buildbot Worker Daemon"; description = "Buildbot Worker Daemon";

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 ];
};
}

View File

@ -9,13 +9,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "certbot"; pname = "certbot";
version = "1.14.0"; version = "1.15.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-J514zgmIcHpwySChFBXGKR4552wS9z5x8Berk/irHSU="; sha256 = "sha256-Z5ZIA0ib+N7La6Z0Taf6DovCF6fXnEDppPQt6Vgwl0c=";
}; };
sourceRoot = "source/${pname}"; sourceRoot = "source/${pname}";

View File

@ -29,6 +29,9 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
disabledTests = [
"RequestsCaBundleTest"
];
disabledTestPaths = lib.optionals stdenv.isDarwin [ "src/crate/client/test_http.py" ]; disabledTestPaths = lib.optionals stdenv.isDarwin [ "src/crate/client/test_http.py" ];
meta = with lib; { meta = with lib; {

View File

@ -9,12 +9,12 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.5.0"; version = "0.6.0";
pname = "dask-image"; pname = "dask-image";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0bf7ea8dcd9d795505b498bd632394720c048f50761e23c574d9a6bacfb27cbb"; sha256 = "1zzxrvbm52xn7azkn74pjinlk0jkpdcyl3r5vxxy5lmjnmzlrrpy";
}; };
propagatedBuildInputs = [ dask scipy pims ]; propagatedBuildInputs = [ dask scipy pims ];

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;
};
}

View File

@ -10,7 +10,7 @@
, gsettings-desktop-schemas , gsettings-desktop-schemas
, fetchurl , fetchurl
, dbus , dbus
, xvfb_run , xvfb-run
, wrapGAppsHook , wrapGAppsHook
# , fetchPypi # , fetchPypi
}: }:
@ -33,7 +33,7 @@ buildPythonPackage {
./nix-support.patch ./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 ]; propagatedBuildInputs = [ at-spi2-core gtk3 pygobject3 pyatspi pycairo ];
strictDeps = false; # issue 56943 strictDeps = false; # issue 56943

View File

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

View File

@ -27,6 +27,11 @@ buildPythonPackage rec {
setuptools setuptools
]; ];
postPatch = ''
substituteInPlace setup.py \
--replace "events>=0.3,<0.4" "events>=0.3,<0.5"
'';
pythonImportsCheck = [ "eve" ]; pythonImportsCheck = [ "eve" ];
# tests call a running mongodb instance # tests call a running mongodb instance

View File

@ -3,8 +3,8 @@
lxml, tzlocal, python-dateutil, pygments, requests-kerberos, lxml, tzlocal, python-dateutil, pygments, requests-kerberos,
defusedxml, cached-property, isodate, requests_ntlm, dnspython, defusedxml, cached-property, isodate, requests_ntlm, dnspython,
psutil, requests-mock, pyyaml, psutil, requests-mock, pyyaml,
oauthlib, requests_oauthlib, oauthlib, requests_oauthlib, tzdata,
flake8, flake8, backports-zoneinfo
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -24,9 +24,11 @@ buildPythonPackage rec {
flake8 flake8
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
lxml tzlocal python-dateutil pygments requests-kerberos lxml tzlocal tzdata python-dateutil pygments requests-kerberos
defusedxml cached-property isodate requests_ntlm dnspython defusedxml cached-property isodate requests_ntlm dnspython
oauthlib requests_oauthlib oauthlib requests_oauthlib
] ++ lib.optionals (pythonOlder "3.9") [
backports-zoneinfo
]; ];
meta = with lib; { meta = with lib; {

View File

@ -28,6 +28,12 @@ buildPythonPackage rec {
./update-django-tagging.patch ./update-django-tagging.patch
]; ];
postPatch = ''
# https://github.com/graphite-project/graphite-web/pull/2701
substituteInPlace setup.py \
--replace "'scandir'" "'scandir; python_version < \"3.5\"'"
'';
propagatedBuildInputs = [ propagatedBuildInputs = [
django django
memcached memcached

View File

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "hg-evolve"; pname = "hg-evolve";
version = "10.3.0"; version = "10.3.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "5d7f73fc1c357134ae9b4a3ed2d844ab8e75a4ca1303679a9e150e87617e7bc7"; sha256 = "03xwnadpvgna70n6pfxb7xdrszppdqrx5qmkbr1v0jzbh5rnzi6b";
}; };
doCheck = false; doCheck = false;
@ -18,7 +18,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Enables the changeset evolution feature of Mercurial core"; description = "Enables the changeset evolution feature of Mercurial core";
homepage = "https://www.mercurial-scm.org/doc/evolution/"; homepage = "https://www.mercurial-scm.org/doc/evolution/";
maintainers = with maintainers; [ xavierzwirtz ]; maintainers = with maintainers; [ xavierzwirtz lukegb ];
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
}; };
} }

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

Some files were not shown because too many files have changed in this diff Show More