Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-03-16 12:25:48 +00:00 committed by GitHub
commit 974e83db9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 317 additions and 132 deletions

View File

@ -29,11 +29,11 @@
# handle that.
mkDerivation rec {
name = "qmmp-1.4.2";
name = "qmmp-1.4.4";
src = fetchurl {
url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
sha256 = "1kvzw0n90crg3dgy8834qrjv0zb3ia5cny7virax9ax73y653jfa";
sha256 = "sha256-sZRZVhCf2ceETuV4AULA0kVkuIMn3C+aYdKThqvPnVQ=";
};
nativeBuildInputs = [ cmake pkg-config ];

View File

@ -17,11 +17,11 @@ let
in
stdenv.mkDerivation rec {
pname = "typora";
version = "0.9.95";
version = "0.9.98";
src = fetchurl {
url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
sha256 = "0kgzk7z707vlbjrvykrnw2h6wscmc3h5hxycyz1z1j2cz26fns4p";
sha256 = "sha256-JiqjxT8ZGttrcJrcQmBoGPnRuuYWZ9u2083RxZoLMus=";
};
nativeBuildInputs = [

View File

@ -1,20 +1,20 @@
{ lib, stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }:
let
pname = "josm";
version = "17428";
version = "17560";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
sha256 = "0fhnq0836jp72br808hhw1ki70zc9wqcwfhnizb8pzjvs4wgx36w";
sha256 = "1ffrbg2d4s2dmc9zy9b4fbsqnp9g0pvp6vnrq7gbsmxh0y23sw56";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip";
sha256 = "126yy6y7mkpqzkrkqkzzn3mwnl1yjkmd5k895k7mmk2inmcsvqgm";
sha256 = "17qrilj20bvzd8ydfjjirpqjrsbqbkxyj4q35q87z9j3pgnd1h71";
};
pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
rev = version;
sha256 = "198kq490y5wzxz0a5prb9anykq6dzg0imxfkchsas233inbzggql";
sha256 = "0wmncbi5g3ijn19qvmvwszb2m79wnv4jpdmpjd7332d3qi5rfmwn";
};
};
in

View File

@ -7,13 +7,13 @@ assert withNerdIcons -> withIcons == false;
stdenv.mkDerivation rec {
pname = "nnn";
version = "3.5";
version = "3.6";
src = fetchFromGitHub {
owner = "jarun";
repo = pname;
rev = "v${version}";
sha256 = "1fa7cmwrzn6kx87kms8i98p9azdlwyh2gnif29l340syl9hkr5qy";
sha256 = "1hwv7ncp8pmzdir30877ni4qlmczmb3yjdkbfd1pssr08y1srsc7";
};
configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf);
@ -22,10 +22,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ readline ncurses ];
makeFlags = [
"DESTDIR=${placeholder "out"}"
"PREFIX="
] ++ lib.optional withIcons [ "O_ICONS=1" ]
makeFlags = [ "PREFIX=$(out)" ]
++ lib.optional withIcons [ "O_ICONS=1" ]
++ lib.optional withNerdIcons [ "O_NERD=1" ];
# shell completions
@ -38,6 +36,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Small ncurses-based file browser forked from noice";
homepage = "https://github.com/jarun/nnn";
changelog = "https://github.com/jarun/nnn/blob/v${version}/CHANGELOG";
license = licenses.bsd2;
platforms = platforms.all;
maintainers = with maintainers; [ jfrankenau Br1ght0ne ];

View File

@ -0,0 +1,48 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, gettext
, intltool
, pkg-config
, wrapGAppsHook
, gtkmm3
, libuuid
, poppler
, qpdf
}:
stdenv.mkDerivation rec {
pname = "pdfslicer";
version = "1.8.8";
src = fetchFromGitHub {
owner = "junrrein";
repo = "pdfslicer";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "0sja0ddd9c8wjjpzk2ag8q1lxpj09adgmhd7wnsylincqnj2jyls";
};
nativeBuildInputs = [
cmake
gettext
intltool
pkg-config
wrapGAppsHook
];
buildInputs = [
gtkmm3
libuuid
poppler
qpdf
];
meta = with lib; {
description = "A simple application to extract, merge, rotate and reorder pages of PDF documents";
homepage = "https://junrrein.github.io/pdfslicer/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dotlambda ];
};
}

View File

@ -0,0 +1,27 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kubectl-doctor";
version = "0.3.0";
src = fetchFromGitHub {
owner = "emirozer";
repo = pname;
rev = version;
sha256 = "0x784jbcwd34vzdnhg2yldh5ivkxvs2qlbsvaammbxkn04ch1ijz";
};
vendorSha256 = "04xq5kp1m7c98gb4fd0dni258vpfnhv535gl2qllfcp2mvk3mn55";
postInstall = ''
mv $out/bin/{cmd,kubectl-doctor}
'';
meta = with lib; {
description = "kubectl cluster triage plugin for k8s";
homepage = "https://github.com/emirozer/kubectl-doctor";
changelog = "https://github.com/emirozer/kubectl-doctor/releases/tag/v${version}";
license = licenses.asl20;
maintainers = [ maintainers.zimbatm ];
};
}

View File

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "FlexGet";
version = "3.1.103";
version = "3.1.106";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "da635a01ae7d15ba31b41081ab3e0214b8c5ab5e4662c381246495d7d1eba9be";
sha256 = "f0ff300a1762d701b77eb16142dcc13d9d099bbed695f1e950392c1d1bb988eb";
};
postPatch = ''

View File

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "maestral-qt";
version = "1.4.2";
version = "1.4.3";
disabled = python3.pkgs.pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral-qt";
rev = "v${version}";
sha256 = "sha256-cPH0wD7RL3OifDTD48x58I4qeaLALOMFnfWXjE2/lUQ=";
sha256 = "sha256-+eBwBZx+kp2ACbFjtYK6ux9lcPmEQsunvxAAZ2HgAYw=";
};
propagatedBuildInputs = with python3.pkgs; [

View File

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, glib, gtk2, pkg-config, hamlib }:
stdenv.mkDerivation rec {
pname = "xlog";
version = "2.0.19";
version = "2.0.20";
src = fetchurl {
url = "https://download.savannah.gnu.org/releases/xlog/${pname}-${version}.tar.gz";
sha256 = "0y38gkcm4mgv6wn31pjq6d5bm22m63rpwa55qjmrlywrmw76rppy";
sha256 = "sha256-pSGmKLHGc+Eb9OG27k1rYOMn/2BiRejrBajARjEgsUA=";
};
# glib-2.62 deprecations

View File

@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
description = "Tiny but powerful single file wavefront obj loader";
license = licenses.mit;
maintainers = [ maintainers.ivar ];
platforms = platforms.linux;
platforms = platforms.all;
};
}

View File

@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ fionera AndersonTorres ];
platforms = with platforms; linux;
platforms = platforms.all;
};
}

View File

@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
description = "UTF-8 with C++ in a Portable Way";
license = licenses.free;
maintainers = with maintainers; [ jobojeha ];
platforms = platforms.linux;
platforms = platforms.all;
};
}

View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = "http://vcg.isti.cnr.it/vcglib/install.html";
description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes";
license = licenses.gpl3;
platforms = platforms.linux;
platforms = platforms.all;
maintainers = with maintainers; [ abbradar ];
};
}

View File

@ -2,19 +2,19 @@
, ke, duff, decompress, cstruct, optint, bigstringaf, stdlib-shims
, bigarray-compat, checkseum, logs, psq, fmt
, result, rresult, fpath, base64, bos, digestif, mmap, alcotest
, crowbar, alcotest-lwt, lwt, findlib, mirage-flow, cmdliner
, crowbar, alcotest-lwt, lwt, findlib, mirage-flow, cmdliner, hxd
}:
buildDunePackage rec {
pname = "carton";
version = "0.2.0";
version = "0.4.0";
useDune2 = true;
minimumOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz";
sha256 = "0gfns4a9p9540kijccsg52yzyn3jfvi737mb0g71yazyc89dqwhn";
sha256 = "777f9692b83cd63570c17527a32c5045818ab9242d923cbbde72fc23d0da0140";
};
# remove changelogs for mimic and the git* packages
@ -30,6 +30,7 @@ buildDunePackage rec {
rresult
fpath
bos
hxd
];
propagatedBuildInputs = [
ke

View File

@ -0,0 +1,28 @@
{ lib, fetchurl, buildDunePackage
, checkseum, bigarray-compat, optint
}:
buildDunePackage rec {
version = "1.2.0";
pname = "decompress";
minimumOCamlVersion = "4.07";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
sha256 = "1c3sq9a6kpzl0pj3gmg7w18ssjjl70yv0r3l7qjprcncjx23v62i";
};
propagatedBuildInputs = [ optint bigarray-compat checkseum ];
# required hxd version is not available in nixpkgs
doCheck = false;
meta = {
description = "Pure OCaml implementation of Zlib";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/mirage/decompress";
};
}

View File

@ -1,10 +1,10 @@
{ lib, fetchurl, buildDunePackage
, checkseum, bigarray-compat, optint
, bigstringaf, alcotest, hxd, camlzip, base64
, checkseum, bigarray-compat, optint, cmdliner
, bigstringaf, alcotest, camlzip, base64, ctypes, fmt
}:
buildDunePackage rec {
version = "1.2.0";
version = "1.3.0";
pname = "decompress";
minimumOCamlVersion = "4.07";
@ -13,11 +13,12 @@ buildDunePackage rec {
src = fetchurl {
url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
sha256 = "1c3sq9a6kpzl0pj3gmg7w18ssjjl70yv0r3l7qjprcncjx23v62i";
sha256 = "de149896939be13fedec46a4581121d5ab74850a2241d08e6aa8ae4bb18c52c4";
};
buildInputs = [ cmdliner ];
propagatedBuildInputs = [ optint bigarray-compat checkseum ];
checkInputs = [ alcotest bigstringaf hxd camlzip base64 ];
checkInputs = [ alcotest bigstringaf ctypes fmt camlzip base64 ];
doCheck = true;
meta = {

View File

@ -1,17 +1,17 @@
{ lib, fetchurl, buildDunePackage
{ lib, fetchurl, buildDunePackage, fetchpatch
, stdlib-shims, bigarray-compat, fmt
, alcotest, hxd, crowbar, bigstringaf
}:
buildDunePackage rec {
pname = "duff";
version = "0.3";
version = "0.4";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/duff/releases/download/v${version}/duff-v${version}.tbz";
sha256 = "1lb67yxk93ifj94p1i3swjbnj5xy8j6xzs72bwvq6cffx5xykznm";
sha256 = "4795e8344a2c2562e0ef6c44ab742334b5cd807637354715889741b20a461da4";
};
propagatedBuildInputs = [ stdlib-shims bigarray-compat fmt ];

View File

@ -8,14 +8,14 @@
buildDunePackage rec {
pname = "git";
version = "3.3.0";
version = "3.3.2";
minimumOCamlVersion = "4.08";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
sha256 = "090b67e8f8a02fb52b4d0c7aa445b5ff7353fdb2da00fb37b908f089c6776cd0";
sha256 = "01xcjggsb13n6018lp6ic0f6pglfl39qcg126h1k3da19hvpzhrv";
};
buildInputs = [

View File

@ -1,4 +1,4 @@
{ buildDunePackage, fetchpatch, git
{ buildDunePackage, git
, mmap, rresult, result, bigstringaf
, fmt, bos, fpath, uri, digestif, logs, lwt, git-cohttp-unix
, mirage-clock, mirage-clock-unix, astring, awa, cmdliner
@ -15,14 +15,6 @@ buildDunePackage {
useDune2 = true;
patches = [
# https://github.com/mirage/ocaml-git/pull/472
(fetchpatch {
url = "https://github.com/sternenseemann/ocaml-git/commit/54998331eb9d5c61afe8901fabe0c74c2877f096.patch";
sha256 = "12kd45mlfaj4hxh33k9920a22mq1q2sdrin2j41w1angvg00d3my";
})
];
buildInputs = [
awa awa-mirage cmdliner git-cohttp-unix
mirage-clock mirage-clock-unix tcpip

View File

@ -1,11 +1,11 @@
{ lib, buildDunePackage, fetchurl
, dune-configurator, cmdliner, angstrom
, rresult, stdlib-shims, fmt, fpath
, ocaml, dune-configurator, cmdliner
, lwt, withLwt ? lib.versionAtLeast ocaml.version "4.07"
}:
buildDunePackage rec {
pname = "hxd";
version = "0.2.0";
version = "0.3.1";
useDune2 = true;
@ -13,24 +13,25 @@ buildDunePackage rec {
src = fetchurl {
url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-v${version}.tbz";
sha256 = "1lyfrq058cc9x0c0hzsf3hv3ys0h8mxkwin9lldidlnj10izqf1l";
sha256 = "1c226c91e17cd329dec0c287bfd20f36302aa533069ff9c6ced32721f96b29bc";
};
# ignore yes stderr output due to trapped SIGPIPE
postPatch = ''
sed -i 's|yes ".\+"|& 2> /dev/null|' test/*.t
'';
nativeBuildInputs = [
dune-configurator
];
propagatedBuildInputs = lib.optional withLwt lwt;
buildInputs = [
cmdliner
angstrom
rresult
fmt
fpath
];
propagatedBuildInputs = [
stdlib-shims
];
doCheck = true;
meta = with lib; {
description = "Hexdump in OCaml";

View File

@ -222,7 +222,8 @@ rec {
core = janePackage {
pname = "core";
hash = "1m9h73pk9590m8ngs1yf4xrw61maiqmi9glmlrl12qhi0wcja5f3";
version = "0.14.1";
hash = "1isrcl07nkmdm6akqsqs9z8s6zvva2lvg47kaagy7gsbyszrqb82";
meta.description = "System-independent part of Core";
buildInputs = [ jst-config ];
propagatedBuildInputs = [ core_kernel spawn timezone ];

View File

@ -2,13 +2,13 @@
buildDunePackage rec {
pname = "owl-base";
version = "1.0.0";
version = "1.0.1";
useDune2 = true;
src = fetchurl {
url = "https://github.com/owlbarn/owl/releases/download/${version}/owl-${version}.tbz";
sha256 = "1gny4351ws2r7dp53nampfyh39l0z6qqvxj5v3d05mpdi2aa06yr";
sha256 = "72ca9f6edd302fdfa16c7559cedac7ac2c885466a367e17ea1ea8807b2dd13ef";
};
minimumOCamlVersion = "4.10";

View File

@ -1,8 +1,11 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, setuptools-scm
, pytestCheckHook
, pytest-asyncio
, pytest-tornado
, pytestcov
, sqlalchemy
, tornado
@ -33,15 +36,16 @@ buildPythonPackage rec {
];
checkInputs = [
pytest-asyncio
pytest-tornado
pytestCheckHook
pytestcov
sqlalchemy
tornado
twisted
mock
trollius
gevent
];
] ++ lib.optionals (!isPy3k) [ trollius ];
propagatedBuildInputs = [
six
@ -51,6 +55,11 @@ buildPythonPackage rec {
setuptools
] ++ lib.optional (!isPy3k) futures;
disabledTests = lib.optionals stdenv.isDarwin [
"test_submit_job"
"test_max_instances"
];
pythonImportsCheck = [ "apscheduler" ];
meta = with lib; {

View File

@ -2,28 +2,26 @@
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pytest-cov
, pytest-mock
, pytestCheckHook
, pythonOlder
, requests
, zeroconf
, websocket_client
, pytest-runner
, zeroconf
}:
buildPythonPackage rec {
pname = "devolo-home-control-api";
version = "0.16.0";
version = "0.17.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "2Fake";
repo = "devolo_home_control_api";
rev = "v${version}";
sha256 = "19zzdbx0dxlm8pq0yk00nn9gqqblgpp16fgl7z6a98hsa6459zzb";
sha256 = "sha256-g82YmlxlBdyNn7KPU+k+J3/P7ABWMMdLXUpXWnCkdpM=";
};
nativeBuildInputs = [ pytest-runner ];
propagatedBuildInputs = [
requests
zeroconf
@ -32,12 +30,22 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
pytest-cov
pytest-mock
];
postPatch = ''
# setup.py is not able to detect the version with setuptools_scm
substituteInPlace setup.py \
--replace "setuptools_scm" "" \
--replace 'use_scm_version=True' 'use_scm_version="${version}"'
'';
# Disable test that requires network access
disabledTests = [ "test__on_pong" ];
disabledTests = [
"test__on_pong"
"TestMprm"
];
pythonImportsCheck = [ "devolo_home_control_api" ];
meta = with lib; {

View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "imap-tools";
version = "0.38.1";
version = "0.39.0";
disabled = isPy27;
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "ikvk";
repo = "imap_tools";
rev = "v${version}";
sha256 = "0b2gnym7p6cwgviwdq8pg2dy28pm5535f8kkc8rzc50knqdifl7g";
sha256 = "sha256-PyksCYVe7Ij/+bZpntHgY51I/ZVnC6L20TcKfTLr2CY=";
};
checkInputs = [

View File

@ -3,25 +3,23 @@
, fetchFromGitHub
, pythonOlder
, python
, alembic, click, desktop-notifier, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, survey, watchdog
, click, desktop-notifier, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, survey, watchdog
, importlib-metadata
, importlib-resources
}:
buildPythonPackage rec {
pname = "maestral";
version = "1.4.2";
version = "1.4.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral";
rev = "v${version}";
sha256 = "sha256-ibAYuaPSty275/aQ0DibyWe2LjPoEpdWgElTnR+MEs8=";
sha256 = "sha256-3GleQNkJrGIkFqOL2Dq0jTpgw7ts9ecpovKbyh3OrEI=";
};
propagatedBuildInputs = [
alembic
click
desktop-notifier
dropbox
@ -34,13 +32,10 @@ buildPythonPackage rec {
requests
setuptools
sdnotify
sqlalchemy
survey
watchdog
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
] ++ lib.optionals (pythonOlder "3.9") [
importlib-resources
];
makeWrapperArgs = [

View File

@ -4,14 +4,14 @@
buildPythonPackage rec {
pname = "mpv";
version = "0.4.7";
version = "0.5.2";
disabled = isPy27;
src = fetchFromGitHub {
owner = "jaseg";
repo = "python-mpv";
rev = "v${version}";
sha256 = "1gq2ynzbpmc7bv066ddv2f4rnmvfsi7034vhf9ffp7yzbixf6ys8";
sha256 = "0ffskpynhl1252h6a05087lvpjgn1cn2z3caiv3i666dn1n79fjd";
};
buildInputs = [ mpv ];
@ -28,6 +28,6 @@ buildPythonPackage rec {
meta = with lib; {
description = "A python interface to the mpv media player";
homepage = "https://github.com/jaseg/python-mpv";
license = licenses.agpl3;
license = licenses.agpl3Plus;
};
}

View File

@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "slack-sdk";
version = "3.4.0";
version = "3.4.2";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "slackapi";
repo = "python-slack-sdk";
rev = "v${version}";
sha256 = "sha256-WlHVorltN8Apq0MZUStPlJZKbBFSbnAoIBQUZYGdDiY=";
sha256 = "sha256-AbQqe6hCy6Ke5lwKHFWLJlXv7HdDApYYK++SPNQ2Nxg=";
};
propagatedBuildInputs = [

View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "vsure";
version = "1.7.2";
version = "1.7.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-EFat1sewh0Y9PHs08Grlk2RparA47GqkUv/WJ3J2494=";
sha256 = "sha256-tnUL9krKHqHR79EROsmVflCy9uO1n0iV6evQc/YpxnM=";
};
propagatedBuildInputs = [ requests ];

View File

@ -1,25 +1,33 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, six
{ lib
, backports_ssl_match_hostname
, buildPythonPackage
, fetchPypi
, isPy27
, pytestCheckHook
, six
}:
buildPythonPackage rec {
version = "0.57.0";
pname = "websocket_client";
version = "0.58.0";
src = fetchPypi {
inherit pname version;
sha256 = "d735b91d6d1692a6a181f2a8c9e0238e5f6373356f561bb9dc4c7af36f452010";
sha256 = "sha256-Y1CbQdFYrlt/Z+tK0g/su07umUNOc+FANU3D/44JcW8=";
};
propagatedBuildInputs = [
six
] ++ lib.optional isPy27 backports_ssl_match_hostname;
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "websocket" ];
meta = with lib; {
description = "Websocket client for python";
description = "Websocket client for Python";
homepage = "https://github.com/websocket-client/websocket-client";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -27,6 +27,6 @@ stdenv.mkDerivation {
description = "Creates a graph of dependencies from GNU-Make; Output is a graphiz-dot file or a Gexf-XML file";
maintainers = with maintainers; [ cmcdragonkai ];
license = licenses.mit;
platforms = platforms.linux;
platforms = platforms.all;
};
}

View File

@ -19,7 +19,7 @@ stdenv.mkDerivation {
description = "Verification script generator for Spin";
homepage = "http://spinroot.com/";
license = licenses.free;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ abbradar ];
};
}

View File

@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/RadeonOpenCompute/rocm-cmake";
license = licenses.mit;
maintainers = with maintainers; [ danieldk ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

View File

@ -104,12 +104,12 @@ rec {
headers = "123g3dgsb4vp8w1bm4apbp973ppzx4i4y35lhhmqjbp51jhrm9f0";
};
electron_12 = mkElectron "12.0.0" {
x86_64-linux = "d132a80e08500e783e36a25cb72bc2555ec388798326c22348e3d9ff57fa91f1";
x86_64-darwin = "18546dec0ecc63d1a679762e00bc85fbb820e08f7ca205924681379bb0a7afc2";
i686-linux = "79651836e857f8c860c6ad053346f7e2cf38351160845687b199faba113b9483";
armv7l-linux = "e98eb2df69f240806e283018d4e0349a45b4cb5b6635d1e1c11d869e50cc60cb";
aarch64-linux = "ea26777ffea5e788bb708814c8707e8ac3529146e7738729aa8bd49d0d74bcd1";
headers = "0h7mkz7wmcf0jq8gmq21ag2ax5ivy2wlz0ykw7rv2r4l5686xdjr";
electron_12 = mkElectron "12.0.1" {
x86_64-linux = "495cd0df420becbd9581b8833fa8bdefaef397fc3590d064932722d55cf5ff82";
x86_64-darwin = "af2adac0b5b32c95ad2b834d5521bd301983954e986048b46cdf5c739423de17";
i686-linux = "4a41d03ef38eda8d50dc57774f49f676398a2130783c2c9a3411e7018ef77e2b";
armv7l-linux = "ae06d70d34abc06c7127a468ab0956a4a26752cc313ab1b802972748e952a3a7";
aarch64-linux = "95716be616ab690c2e78236715fe52ae57b4213fe1c19dc08593ae1e75b8767e";
headers = "1gxzafzi47wrvwrzmll5zff7dzw4jk2p5pdkzgazr2yxkhw9qvca";
};
}

View File

@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/foldex/r2mod_cli";
license = licenses.gpl3Only;
maintainers = [ maintainers.reedrw ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

View File

@ -21,7 +21,7 @@ stdenv.mkDerivation {
back to data on the other side.
'';
license = licenses.mit;
platforms = platforms.linux;
platforms = platforms.all;
maintainers = [ maintainers.cstrahan ];
};
}

View File

@ -1,4 +1,7 @@
{ lib, python3, fetchFromGitHub }:
{ lib
, python3
, fetchFromGitHub
}:
let
python = python3.override {
@ -24,10 +27,11 @@ let
in python.pkgs.buildPythonApplication rec {
pname = "appdaemon";
version = "4.0.5";
disabled = python.pythonOlder "3.6";
src = fetchFromGitHub {
owner = "home-assistant";
repo = "appdaemon";
owner = "AppDaemon";
repo = pname;
rev = version;
sha256 = "7o6DrTufAC+qK3dDfpkuQMQWuduCZ6Say/knI4Y07QM=";
};
@ -63,12 +67,13 @@ in python.pkgs.buildPythonApplication rec {
--replace "feedparser==5.2.1" "feedparser>=5.2.1" \
--replace "aiohttp_jinja2==1.2.0" "aiohttp_jinja2>=1.2.0" \
--replace "pygments==2.6.1" "pygments>=2.6.1" \
--replace "paho-mqtt==1.5.0" "paho-mqtt>=1.5.0"
--replace "paho-mqtt==1.5.0" "paho-mqtt>=1.5.0" \
--replace "websocket-client==0.57.0" "websocket-client>=0.57.0"
'';
meta = with lib; {
description = "Sandboxed Python execution environment for writing automation apps for Home Assistant";
homepage = "https://github.com/home-assistant/appdaemon";
homepage = "https://github.com/AppDaemon/appdaemon";
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg dotlambda ];
};

View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/roehling/postsrsd";
description = "Postfix Sender Rewriting Scheme daemon";
license = licenses.gpl2;
platforms = platforms.linux;
platforms = platforms.all;
maintainers = with maintainers; [ abbradar ];
};
}

View File

@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
};
postPatch = ''
sed -e "s|/usr||g" -i Makefile
substituteInPlace Makefile --replace "/usr" ""
substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
'';
makeFlags = [ "DESTDIR=$(out)" "BINDIR=/bin" ];
@ -39,6 +40,6 @@ stdenv.mkDerivation rec {
homepage = "http://p910nd.sourceforge.net/";
downloadPage = "https://sourceforge.net/projects/p910nd/";
license = licenses.gpl2;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, rustPlatform }:
{ stdenv, lib, fetchFromGitHub, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
pname = "routinator";
@ -11,6 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-JwPAwhD+Pkx8Kx24m7z/RbEvDnI2YR8dnTgAV7TMsFE=";
};
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
cargoSha256 = "sha256-lhSSyJxxHc0t43xoDMtr/lSVL0xZl6poPYiyYXNvKKQ=";
meta = with lib; {
@ -18,6 +19,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/NLnetLabs/routinator";
license = licenses.bsd3;
maintainers = with maintainers; [ _0x4A6F ];
platforms = platforms.linux;
platforms = platforms.all;
};
}

View File

@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
description = "A lightweight UDP torrent tracker";
homepage = "https://naim94a.github.io/udpt";
license = lib.licenses.gpl3;
platforms = lib.platforms.linux;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ makefu ];
};
}

View File

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
license = licenses.osl3;
homepage = "https://restya.com";
maintainers = with maintainers; [ tstrobel ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

View File

@ -19,7 +19,7 @@ stdenv.mkDerivation {
description = "A ZSH theme optimized for people who use Git & Unicode-compatible fonts and terminals";
homepage = "https://github.com/halfo/lambda-mod-zsh-theme/";
license = licenses.mit;
platforms = platforms.linux;
platforms = platforms.all;
maintainers = with maintainers; [ ma27 ];
};
}

View File

@ -11,10 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "15hi8kfknldwpvm885r9s7zd5h7cirs7x0zazx2nnz62xvz3iymk";
};
configurePhase = ''
postPatch = ''
sed -i src/anlghead.h \
-e "s|#define DEFAULTCONFIGFILE .*|#define DEFAULTCONFIGFILE \"$out/etc/analog.cfg\"|g" \
-e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/$pname}/lang/\"|g"
substituteInPlace src/Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
'';
installPhase = ''
@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2;
description = "Powerful tool to generate web server statistics";
maintainers = [ lib.maintainers.peti ];
platforms = lib.platforms.linux;
platforms = lib.platforms.all;
};
}

View File

@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
};
postPatch = ''
substituteInPlace Makefile --replace /usr/local $out
substituteInPlace Makefile \
--replace /usr/local $out \
--replace gcc "${stdenv.cc.targetPrefix}cc"
'';
meta = with lib; {
@ -17,6 +19,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.fourmilab.ch/webtools/midicsv/";
license = licenses.publicDomain;
maintainers = with maintainers; [ orivej ];
platforms = platforms.linux;
platforms = platforms.all;
};
}

View File

@ -0,0 +1,45 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, glib
, cairo
, pango
, gdk-pixbuf
, atk
, gtk3
}:
rustPlatform.buildRustPackage rec {
pname = "czkawka";
version = "3.0.0";
src = fetchFromGitHub {
owner = "qarmin";
repo = pname;
rev = version;
sha256 = "1g5a9ns5lkiyk6hjsh08hgs41538dzj0a4lgn2c5cbad5psl0xa6";
};
cargoSha256 = "11ym2d7crp12w91111s3rv0gklkg2bzlq9g24cws4h7ipi0zfx5h";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
glib
cairo
pango
gdk-pixbuf
atk
gtk3
];
meta = with lib; {
description = "A simple, fast and easy to use app to remove unnecessary files from your computer";
homepage = "https://github.com/qarmin/czkawka";
license = with licenses; [ mit ];
maintainers = with maintainers; [ yanganto ];
};
}

View File

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "prs";
version = "0.2.3";
version = "0.2.4";
src = fetchFromGitLab {
owner = "timvisee";
repo = "prs";
rev = "v${version}";
sha256 = "sha256-aulrMXKKCFo8nU6mEplcpaGGMfLr03FCgIF6rg6LqGg=";
sha256 = "sha256-8rISyZdxxGqpZlOc4ziY33tMRK/w4fiTVCiK5RVBDvw=";
};
cargoSha256 = "sha256-996iwBOp5F9q9/yptTHtsLj6wlY5HEpp8CWTbpBWPuA=";
cargoSha256 = "sha256-sxYm6uNTvBZsjzHywduq0fhnqZMbECLqxq8yg3ZxtVU=";
postPatch = ''
# The GPGME backend is recommended

View File

@ -22,13 +22,13 @@ let
++ recommendedDisplayInformationPrograms;
in stdenv.mkDerivation rec {
pname = "inxi";
version = "3.3.01-1";
version = "3.3.02-1";
src = fetchFromGitHub {
owner = "smxi";
repo = "inxi";
rev = version;
sha256 = "sha256-wY9wsxBByxqy9qk/7UoKiUSpFGS1rFpdyTs3ig6OJRs=";
sha256 = "sha256-hBFOJxmHtlowe/4AnIRnUVHFYPTjnMV6bswayGcoGlA=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -1998,6 +1998,8 @@ in
cowsay = callPackage ../tools/misc/cowsay { };
czkawka = callPackage ../tools/misc/czkawka { };
cherrytree = callPackage ../applications/misc/cherrytree { };
chntpw = callPackage ../tools/security/chntpw { };
@ -2887,7 +2889,9 @@ in
roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { });
routinator = callPackage ../servers/routinator { };
routinator = callPackage ../servers/routinator {
inherit (darwin.apple_sdk.frameworks) Security;
};
rsbep = callPackage ../tools/backup/rsbep { };
@ -23516,6 +23520,8 @@ in
kubectl = callPackage ../applications/networking/cluster/kubectl { };
kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { };
kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { };
kubeless = callPackage ../applications/networking/cluster/kubeless { };
@ -24580,6 +24586,8 @@ in
wxGTK = wxGTK30-gtk3;
};
pdfslicer = callPackage ../applications/misc/pdfslicer { };
pekwm = callPackage ../applications/window-managers/pekwm { };
pencil = callPackage ../applications/graphics/pencil {

View File

@ -238,6 +238,8 @@ let
decompress = callPackage ../development/ocaml-modules/decompress { };
decompress-1-2 = callPackage ../development/ocaml-modules/decompress/1.2.nix { };
diet = callPackage ../development/ocaml-modules/diet { };
digestif = callPackage ../development/ocaml-modules/digestif { };
@ -399,7 +401,9 @@ let
hxd = callPackage ../development/ocaml-modules/hxd { };
imagelib = callPackage ../development/ocaml-modules/imagelib { };
imagelib = callPackage ../development/ocaml-modules/imagelib {
decompress = decompress-1-2;
};
inotify = callPackage ../development/ocaml-modules/inotify { };