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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar 2021-05-12 14:31:36 +02:00
commit 71fa678899
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
37 changed files with 321 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/navi/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "navi";
version = "2.15.0";
version = "2.16.0";
src = fetchFromGitHub {
owner = "denisidoro";
repo = "navi";
rev = "v${version}";
sha256 = "sha256-qcfSGV/+FkyWGAApekRZHWGmeB9gIURt11DKn7lEh+o=";
sha256 = "sha256-ngSZFYGE+Varul/qwavMO3xcMIp8w2WETWXc573wYhQ=";
};
cargoSha256 = "sha256-HpGzDZMIzO0lpussmm+kJNOU7zghcYrQWZo3WZ5FOmA=";
cargoSha256 = "sha256-qtxFTk0iCxPa4Z7H9+QWSii+iYrLUV2LfiAEbePdhOQ=";
nativeBuildInputs = [ makeWrapper ];

11
pkgs/applications/misc/obsidian/default.nix
View File

@ -30,17 +30,18 @@ let
in stdenv.mkDerivation rec {
pname = "obsidian";
version = "0.11.13";
version = "0.12.3";
src = fetchurl {
url =
"https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz";
sha256 = "0QL1rP37pmdIdGM9eHa7PfW1GVrvn2fX4bQPqQ8FOpI=";
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz";
sha256 = "sha256-nwtQp7BkMZwMzfnA5wdcMAhfezM//Lm9cf0pbvnOVZE=";
};
nativeBuildInputs = [ makeWrapper graphicsmagick ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
makeWrapper ${electron}/bin/electron $out/bin/obsidian \
@ -56,6 +57,8 @@ in stdenv.mkDerivation rec {
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png
done
runHook postInstall
'';
passthru.updateScript = updateScript;

18
pkgs/applications/networking/irc/communi/default.nix
View File

@ -1,4 +1,4 @@
{ fetchgit, libcommuni, qtbase, qmake, lib, stdenv }:
{ fetchgit, libcommuni, qtbase, qmake, lib, stdenv, wrapQtAppsHook }:
stdenv.mkDerivation rec {
pname = "communi";
@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
nativeBuildInputs = [ qmake ];
nativeBuildInputs = [ qmake ]
++ lib.optional stdenv.isDarwin wrapQtAppsHook;
buildInputs = [ libcommuni qtbase ];
@ -25,14 +26,23 @@ stdenv.mkDerivation rec {
qmakeFlags = [
"COMMUNI_INSTALL_PREFIX=${placeholder "out"}"
"COMMUNI_INSTALL_BINS=${placeholder "out"}/bin"
"COMMUNI_INSTALL_PLUGINS=${placeholder "out"}/lib/communi/plugins"
"COMMUNI_INSTALL_ICONS=${placeholder "out"}/share/icons/hicolor"
"COMMUNI_INSTALL_DESKTOP=${placeholder "out"}/share/applications"
"COMMUNI_INSTALL_THEMES=${placeholder "out"}/share/communi/themes"
(if stdenv.isDarwin
then [ "COMMUNI_INSTALL_BINS=${placeholder "out"}/Applications" ]
else [ "COMMUNI_INSTALL_BINS=${placeholder "out"}/bin" ])
];
postInstall = lib.optionalString stdenv.isLinux ''
postInstall = if stdenv.isDarwin then ''
# Nix qmake does not add the bundle rpath by default.
install_name_tool \
-add_rpath @executable_path/../Frameworks \
$out/Applications/Communi.app/Contents/MacOS/Communi
wrapQtApp $out/Applications/Communi.app/Contents/MacOS/Communi
'' else ''
substituteInPlace "$out/share/applications/communi.desktop" \
--replace "/usr/bin" "$out/bin"
'';

4
pkgs/applications/video/gnomecast/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, python3Packages, gtk3, gobject-introspection, ffmpeg_3, wrapGAppsHook }:
{ stdenv, lib, python3Packages, gtk3, gobject-introspection, ffmpeg, wrapGAppsHook }:
with python3Packages;
buildPythonApplication rec {
@ -21,7 +21,7 @@ buildPythonApplication rec {
strictDeps = false;
preFixup = ''
gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg_3 ]})
gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg ]})
'';
# no tests

9
pkgs/desktops/gnome/games/aisleriot/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv
, fetchFromGitLab
, nix-update-script
, pkg-config
, gnome
, itstool
, gtk3
, wrapGAppsHook
@ -19,14 +19,14 @@
stdenv.mkDerivation rec {
pname = "aisleriot";
version = "3.22.13";
version = "3.22.16";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
rev = version;
sha256 = "05k84bbgrrxchxg08l1jjcz384kpjdmxd24g0wnf731aa9zcnp5k";
sha256 = "0arjnm5kgnb4pir53hlm94iym80d0srs256sm2hwhwwc5fr1w79i";
};
nativeBuildInputs = [
@ -61,8 +61,7 @@ stdenv.mkDerivation rec {
];
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
updateScript = nix-update-script {
attrPath = "gnome.${pname}";
};
};

2
pkgs/development/compilers/ghdl/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
'';
configureFlags = [ "--enable-synth" ] ++ lib.optional (backend == "llvm")
"--with-llvm-config=${llvm}/bin/llvm-config";
"--with-llvm-config=${llvm.dev}/bin/llvm-config";
hardeningDisable = [ "format" ];

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

@ -19,7 +19,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
dontUseQmakeConfigure = true;
configureFlags = [ "-config" "release" ];
configureFlags = [ "-config" "release" ]
# Build mixes up dylibs/frameworks if one is not explicitely specified.
++ lib.optionals stdenv.isDarwin [ "-config" "qt_framework" ];
dontWrapQtApps = true;

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

@ -15,7 +15,7 @@
stdenv.mkDerivation rec {
pname = "libxmlb";
version = "0.3.0";
version = "0.3.1";
outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ];
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
owner = "hughsie";
repo = "libxmlb";
rev = version;
sha256 = "sha256-prHsigfjifwiuBSUHaCWhjJIaw1LkOGHJu20cdPgH9c=";
sha256 = "sha256-4gJBmSbo5uGj12Y2Ov4gmS8nJshQxuBM9BAevY/lwjg=";
};
patches = [

37
pkgs/development/libraries/mapnik/default.nix
View File

@ -23,18 +23,42 @@ stdenv.mkDerivation rec {
buildInputs =
[ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff
libwebp libxml2 proj python sqlite zlib
libwebp proj python sqlite zlib
# optional inputs
postgresql
];
propagatedBuildInputs = [ libxml2 ];
prefixKey = "PREFIX=";
preConfigure = ''
patchShebangs ./configure
'';
# NOTE: 2021-05-06:
# Add -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 for backwards compatibility
# with major versions 6 and 7 of proj which are otherwise not compatible
# with mapnik 3.1.0. Note that:
#
# 1. Starting with proj version 8, this workaround will no longer be
# supported by the upstream proj project.
#
# 2. Without the workaround, mapnik configures itself without proj support.
#
# 3. The master branch of mapnik (after 3.1.0) appears to add native support
# for the proj 6 api, so this workaround is not likely to be needed in
# subsequent mapnik releases. At that point, this block comment and the
# NIX_CFLAGS_COMPILE expression can be removed.
NIX_CFLAGS_COMPILE =
if version != "3.1.0" && lib.versionAtLeast version "3.1.0"
then throw "The mapnik compatibility workaround for proj 6 may no longer be required. Remove workaround after checking."
else if lib.versionAtLeast (lib.getVersion proj) "8"
then throw ("mapnik currently requires a version of proj less than 8, but proj version is: " + (lib.getVersion proj))
else "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1";
configureFlags = [
"BOOST_INCLUDES=${boost.dev}/include"
"BOOST_LIBS=${boost.out}/lib"
@ -51,16 +75,19 @@ stdenv.mkDerivation rec {
"JPEG_LIBS=${libjpeg.out}/lib"
"PNG_INCLUDES=${libpng.dev}/include"
"PNG_LIBS=${libpng.out}/lib"
"PROJ_INCLUDES=${proj}/include"
"PROJ_LIBS=${proj}/lib"
"PROJ_INCLUDES=${proj.dev}/include"
"PROJ_LIBS=${proj.out}/lib"
"SQLITE_INCLUDES=${sqlite.dev}/include"
"SQLITE_LIBS=${sqlite.out}/lib"
"TIFF_INCLUDES=${libtiff.dev}/include"
"TIFF_LIBS=${libtiff.out}/lib"
"WEBP_INCLUDES=${libwebp}/include"
"WEBP_LIBS=${libwebp}/lib"
"XML2_INCLUDES=${libxml2.dev}/include"
"XML2_LIBS=${libxml2.out}/lib"
"XMLPARSER=libxml2"
];
buildFlags = [
"JOBS=$(NIX_BUILD_CORES)"
];
meta = with lib; {

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

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "md4c";
version = "0.4.7";
version = "0.4.8";
src = fetchFromGitHub {
owner = "mity";
repo = pname;
rev = "release-${version}";
hash = "sha256-nfMXUP1wu3ifn1QVTO/+XcfFRsThG8PlmYRv+b8AYlQ=";
hash = "sha256-+LObAD5JB8Vb4Rt4hTo1Z4ispxzfFkkXA2sw6TKB7Yo=";
};
nativeBuildInputs = [

6
pkgs/development/libraries/webkitgtk/default.nix
View File

@ -53,13 +53,14 @@
, xdg-dbus-proxy
, substituteAll
, glib
, addOpenGLRunpath
}:
assert enableGeoLocation -> geoclue2 != null;
stdenv.mkDerivation rec {
pname = "webkitgtk";
version = "2.32.0";
version = "2.32.1";
outputs = [ "out" "dev" ];
@ -67,13 +68,14 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
sha256 = "1w3b0w8izp0i070grhv19j631sdcd0mcqnjnax13k8mdx7dg8zcx";
sha256 = "05v9hgpkc6mi2klrd8nqql1n8xzq8rgdz3hvyy369xkhgwqifq8k";
};
patches = lib.optionals stdenv.isLinux [
(substituteAll {
src = ./fix-bubblewrap-paths.patch;
inherit (builtins) storeDir;
inherit (addOpenGLRunpath) driverLink;
})
./libglvnd-headers.patch
];

14
pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch
View File

@ -1,16 +1,7 @@
diff -ru old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
--- old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-09 04:47:07.000000000 -0400
+++ webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-20 21:14:10.537921173 -0400
@@ -585,7 +585,7 @@
{ SCMP_SYS(keyctl), nullptr },
{ SCMP_SYS(request_key), nullptr },
- // Scary VM/NUMA ops
+ // Scary VM/NUMA ops
{ SCMP_SYS(move_pages), nullptr },
{ SCMP_SYS(mbind), nullptr },
{ SCMP_SYS(get_mempolicy), nullptr },
@@ -724,6 +724,11 @@
@@ -724,6 +724,12 @@
"--ro-bind-try", "/usr/local/lib64", "/usr/local/lib64",
"--ro-bind-try", PKGLIBEXECDIR, PKGLIBEXECDIR,
@ -18,7 +9,8 @@ diff -ru old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLa
+ // Nix Directories
+ "--ro-bind", "@storeDir@", "@storeDir@",
+ "--ro-bind", "/run/current-system", "/run/current-system",
+ "--ro-bind", "/run/opengl-driver", "/run/opengl-driver",
+ "--ro-bind-try", "@driverLink@/lib", "@driverLink@/lib",
+ "--ro-bind-try", "@driverLink@/share", "@driverLink@/share",
};
// We would have to parse ld config files for more info.
bindPathVar(sandboxArgs, "LD_LIBRARY_PATH");

1
pkgs/development/php-packages/apcu_bc/default.nix
View File

@ -15,4 +15,5 @@ buildPecl {
'';
meta.maintainers = lib.teams.php.members;
meta.broken = lib.versionAtLeast php.version "8";
}

8
pkgs/development/python-modules/aioasuswrt/default.nix
View File

@ -9,18 +9,16 @@
buildPythonPackage rec {
pname = "aioasuswrt";
version = "1.3.3";
version = "1.3.4";
src = fetchFromGitHub {
owner = "kennedyshead";
repo = pname;
rev = "V${version}";
sha256 = "1h1qwc7szgrcwiz4q6x4mlf26is20lj1ds5rcb9i611j26656v6d";
rev = version;
sha256 = "101d76zarvilzfmcy8n3bjqzyars8hsjzr0zc80d4rngv4vhrki1";
};
postPatch = ''
substituteInPlace setup.py \
--replace "cryptography==3.3.2" "cryptography"
substituteInPlace setup.cfg \
--replace "--cov-report html" "" \
--replace "--cov-report term-missing" ""

79
pkgs/development/python-modules/connexion/default.nix
View File

@ -1,89 +1,60 @@
{ buildPythonPackage
, fetchFromGitHub
, isPy3k
, glibcLocales
, lib
, pythonOlder
{ lib
, aiohttp
, aiohttp-swagger
, aiohttp-jinja2
, aiohttp-remotes
, aiohttp-swagger
, buildPythonPackage
, clickclick
, decorator
, flake8
, fetchFromGitHub
, flask
, gevent
, inflection
, jsonschema
, mock
, openapi-spec-validator
, pathlib
, pytest
, pytest-aiohttp
, pytestcov
, pytestCheckHook
, pythonOlder
, pyyaml
, requests
, six
, swagger-ui-bundle
, testfixtures
, typing ? null
, ujson
}:
buildPythonPackage rec {
pname = "connexion";
version = "2.4.0";
version = "2.7.0";
disabled = pythonOlder "3.6";
# we're fetching from GitHub because tests weren't distributed on PyPi
src = fetchFromGitHub {
owner = "zalando";
repo = pname;
rev = version;
sha256 = "1b9q027wrks0afl7l3a1wxymz3aick26b9fq2m07pc5wb9np0vvg";
sha256 = "15iflq5403diwda6n6qrpq67wkdcvl3vs0gsg0fapxqnq3a2m7jj";
};
checkInputs = [
decorator
mock
pytest
pytestcov
testfixtures
flask
swagger-ui-bundle
]
++ lib.optionals isPy3k [ aiohttp aiohttp-jinja2 aiohttp-swagger ujson pytest-aiohttp ]
++ lib.optional (pythonOlder "3.7") glibcLocales
;
propagatedBuildInputs = [
aiohttp
aiohttp-jinja2
aiohttp-swagger
clickclick
flask
inflection
jsonschema
openapi-spec-validator
pyyaml
requests
six
inflection
openapi-spec-validator
swagger-ui-bundle
flask
]
++ lib.optional (pythonOlder "3.4") pathlib
++ lib.optional (pythonOlder "3.6") typing
++ lib.optionals isPy3k [ aiohttp aiohttp-jinja2 aiohttp-swagger ujson ]
;
];
preConfigure = lib.optional (pythonOlder "3.7") ''
export LANG=en_US.UTF-8
'';
checkInputs = [
aiohttp-remotes
decorator
pytest-aiohttp
pytestCheckHook
testfixtures
];
postPatch = ''
substituteInPlace setup.py --replace "'aiohttp>=2.3.10,<3.5.2'" "'aiohttp>=2.3.10'"
'';
checkPhase = if isPy3k then ''
pytest -k "not test_app_get_root_path and \
not test_verify_oauth_scopes_remote and \
not test_verify_oauth_scopes_local and \
not test_run_with_aiohttp_not_installed"''
else "pytest --ignore=tests/aiohttp";
pythonImportsCheck = [ "connexion" ];
meta = with lib; {
description = "Swagger/OpenAPI First framework on top of Flask";

36
pkgs/development/python-modules/ics/default.nix
View File

@ -1,6 +1,11 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
, tatsu, arrow
, pytestCheckHook, pytest-flakes
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, tatsu
, arrow
, pytestCheckHook
, pytest-flakes
}:
buildPythonPackage rec {
@ -9,21 +14,35 @@ buildPythonPackage rec {
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "C4ptainCrunch";
repo = "ics.py";
owner = "ics-py";
repo = "ics-py";
rev = "v${version}";
sha256 = "0rrdc9rcxc3ys6rml81b8m8qdlisk78a34bdib0wy65hlkmyyykn";
};
propagatedBuildInputs = [ tatsu arrow ];
propagatedBuildInputs = [
arrow
tatsu
];
checkInputs = [
pytest-flakes
pytestCheckHook
];
postPatch = ''
# 0.8 will move to python-dateutil
substituteInPlace requirements.txt \
--replace "arrow>=0.11,<0.15" "arrow"
substituteInPlace setup.cfg --replace "--pep8" ""
'';
checkInputs = [ pytestCheckHook pytest-flakes ];
disabledTests = [
# Failure seems to be related to arrow > 1.0
"test_event"
];
pythonImportsCheck = [ "ics" ];
meta = with lib; {
description = "Pythonic and easy iCalendar library (RFC 5545)";
@ -32,9 +51,8 @@ buildPythonPackage rec {
write ics data in a developer friendly way.
'';
homepage = "http://icspy.readthedocs.org/en/stable/";
changelog = "https://github.com/C4ptainCrunch/ics.py/releases/tag/v${version}";
changelog = "https://github.com/ics-py/ics-py/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ primeos ];
};
}

6
pkgs/development/python-modules/python-mapnik/default.nix
View File

@ -35,10 +35,16 @@ in buildPythonPackage rec {
export BOOST_PYTHON_LIB="boost_python${pythonVersion}"
export BOOST_THREAD_LIB="boost_thread"
export BOOST_SYSTEM_LIB="boost_system"
export PYCAIRO=true
'';
nativeBuildInputs = [
mapnik # for mapnik_config
pkgs.pkgconfig
];
patches = [
./find-pycairo-with-pkg-config.patch
];
buildInputs = [

18
pkgs/development/python-modules/python-mapnik/find-pycairo-with-pkg-config.patch Normal file
View File

@ -0,0 +1,18 @@
diff --git a/setup.py b/setup.py
index 82a31d733..1c876a553 100755
--- a/setup.py
+++ b/setup.py
@@ -228,10 +228,9 @@ extra_comp_args = list(filter(lambda arg: arg != "-fvisibility=hidden", extra_co
if os.environ.get("PYCAIRO", "false") == "true":
try:
extra_comp_args.append('-DHAVE_PYCAIRO')
- print("-I%s/include/pycairo".format(sys.exec_prefix))
- extra_comp_args.append("-I{0}/include/pycairo".format(sys.exec_prefix))
- #extra_comp_args.extend(check_output(["pkg-config", '--cflags', 'pycairo']).strip().split(' '))
- #linkflags.extend(check_output(["pkg-config", '--libs', 'pycairo']).strip().split(' '))
+ pycairo_name = 'py3cairo' if PYTHON3 else 'pycairo'
+ extra_comp_args.extend(check_output(["pkg-config", '--cflags', pycairo_name]).strip().split(' '))
+ linkflags.extend(check_output(["pkg-config", '--libs', pycairo_name]).strip().split(' '))
except:
raise Exception("Failed to find compiler options for pycairo")

3
pkgs/development/python-modules/pytorch/bin.nix
View File

@ -18,7 +18,7 @@ let
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
srcs = import ./binary-hashes.nix version;
unsupported = throw "Unsupported system";
version = "1.8.0";
version = "1.8.1";
in buildPythonPackage {
inherit version;
@ -64,6 +64,7 @@ in buildPythonPackage {
meta = with lib; {
description = "Open source, prototype-to-production deep learning platform";
homepage = "https://pytorch.org/";
changelog = "https://github.com/pytorch/pytorch/releases/tag/v${version}";
license = licenses.unfree; # Includes CUDA and Intel MKL.
platforms = platforms.linux;
maintainers = with maintainers; [ danieldk ];

15
pkgs/development/python-modules/pytorch/binary-hashes.nix
View File

@ -1,14 +1,17 @@
version: {
x86_64-linux-37 = {
url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp37-cp37m-linux_x86_64.whl";
hash = "sha256-bs29RJS0vy0xok3fvf8yvZlTibyGYqRUvUDT6M4gKQc=";
name = "torch-${version}-cp37-cp37m-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu102/torch-${version}%2Bcu102-cp37-cp37m-linux_x86_64.whl";
hash = "sha256-79JK2gGlV5Lhbim7GgPCjk++brwpUQE7g7vsrBu06eE=";
};
x86_64-linux-38 = {
url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp38-cp38-linux_x86_64.whl";
hash = "sha256-+h45HMo5N9Xeox8xoagKAb1KgGLAOUSMJUu/WljrB4c=";
name = "torch-${version}-cp38-cp38-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu102/torch-${version}%2Bcu102-cp38-cp38-linux_x86_64.whl";
hash = "sha256-16h90SdxAgFxmPpgUPA3rBGxs9dtFaCeAgeSpKmtnmQ=";
};
x86_64-linux-39 = {
url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp39-cp39-linux_x86_64.whl";
hash = "sha256-Ixj6yGCuc9xkhsDeIiNnTZ72E5/HXxV68r+Nzk/KVSQ=";
name = "torch-${version}-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu102/torch-${version}%2Bcu102-cp39-cp39-linux_x86_64.whl";
hash = "sha256-E3RLWpGYbRuKsz0pQv7npmC7WTbdvlYFaxXQYBKT2/8=";
};
}

6
pkgs/development/tools/gojsontoyaml/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gojsontoyaml";
version = "unstable-2020-06-02";
version = "unstable-2020-12-16";
src = fetchFromGitHub {
owner = "brancz";
repo = "gojsontoyaml";
rev = "3697ded27e8cfea8e547eb082ebfbde36f1b5ee6";
sha256 = "07sisadpfnzbylzirs5ski8wl9fl18dm7xhbv8imw6ksxq4v467a";
rev = "202f76bf8c1f8fb74941a845b349941064603185";
sha256 = "sha256-N49iHQh28nAZBGJnLKG/aZPdn5fwPKQpdrXXtX28yss=";
};
vendorSha256 = null;

130
pkgs/misc/vim-plugins/generated.nix
View File

@ -269,12 +269,12 @@ let
barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar-nvim";
version = "2021-05-10";
version = "2021-05-11";
src = fetchFromGitHub {
owner = "romgrk";
repo = "barbar.nvim";
rev = "1e7347964ceab49c5ed7e1224de328cdd8b90919";
sha256 = "00p1h7nznrhjfddxzxamyjkf9cgdjw9f8zhzs366k8gfva5fh4r3";
rev = "78ab34de8c77e2e230502945bd4d156af5d54ab8";
sha256 = "0smbf73i0ingvagxyjk6lb6g2axr6mgqk74c8w27504bnvay7y0w";
};
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
};
@ -401,12 +401,12 @@ let
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-05-11";
version = "2021-05-12";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "2ccce5fa035176b51fa628ba6c672dedf78813e8";
sha256 = "0nrxxwf4wy6g5222qf4bjbyai8gym1k0b4wdyjpldfk5pdxd81zg";
rev = "4e5d98ff3a243167cafbc48de104a279b42318ac";
sha256 = "006rgvhvnd30qygqdqrlqxbc3yv9qk2ndmr7rkd5fln95g7ib8b5";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -718,8 +718,8 @@ let
src = fetchFromGitHub {
owner = "Shougo";
repo = "context_filetype.vim";
rev = "39a552866c83946127f244912b6d408525f03364";
sha256 = "0m2w4f3bn8miplxb9q76fcipdkc9lbfyp47193q57s555b1g0x0k";
rev = "62c74b280d5cb0c16ed7a84e5b4eff4336d30d40";
sha256 = "1bwwcf6lnx0drjn7192fnplnq1xw85yf2g2fh7mnab7i5w2lmbw3";
};
meta.homepage = "https://github.com/Shougo/context_filetype.vim/";
};
@ -738,12 +738,12 @@ let
Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail";
version = "2021-05-07";
version = "2021-05-11";
src = fetchFromGitHub {
owner = "whonore";
repo = "Coqtail";
rev = "b24f6df45012c2c53743777b306fdb9396dcb5e9";
sha256 = "08xqgkivczp3yciqc3xigdfl1q4c14mfa0i27didwds73i94mqqd";
rev = "2cababf4c1b6cc2e460bbbd63e69ed5d9fc2ee34";
sha256 = "086gqc76ki8jwhhk4ihawjciwjsrq9k13bgwlnjhsp2rhm0vslb7";
};
meta.homepage = "https://github.com/whonore/Coqtail/";
};
@ -1280,12 +1280,12 @@ let
echodoc-vim = buildVimPluginFrom2Nix {
pname = "echodoc-vim";
version = "2021-04-16";
version = "2021-05-11";
src = fetchFromGitHub {
owner = "Shougo";
repo = "echodoc.vim";
rev = "63d3c193ccb1652a972ca0def7ab82048bfb6068";
sha256 = "0v0fd6n6fza1rj008zpjicvh9d8mcvz3kza8hhby9nx9cjlj2dpc";
rev = "7dc1d45d7ffd275c06bf207795cf071ae6c9f1a4";
sha256 = "1hxywy423ikfkmcyqm467j741mn0ar4c5k7li0liniygjwpiaxjm";
};
meta.homepage = "https://github.com/Shougo/echodoc.vim/";
};
@ -1811,12 +1811,12 @@ let
gruvbox-nvim = buildVimPluginFrom2Nix {
pname = "gruvbox-nvim";
version = "2021-05-10";
version = "2021-05-12";
src = fetchFromGitHub {
owner = "npxbr";
repo = "gruvbox.nvim";
rev = "c26c456a6b36cac79e01f6cf7eebb8cc9231ab16";
sha256 = "0kpgkdwkz27xl56yicf8b8zhqg84657s14xl0blh802cm275hz92";
rev = "86bc293204a6c13f1650378c39bf248bd5a5a22f";
sha256 = "0if2ad8s9r3pwdsqlkl6y82r0a0z86c6vlkdp28m18sxv848psx5";
};
meta.homepage = "https://github.com/npxbr/gruvbox.nvim/";
};
@ -2268,12 +2268,12 @@ let
LeaderF = buildVimPluginFrom2Nix {
pname = "LeaderF";
version = "2021-05-07";
version = "2021-05-11";
src = fetchFromGitHub {
owner = "Yggdroot";
repo = "LeaderF";
rev = "e65a9b9b88df503340643d3c086ec1ee53898891";
sha256 = "0x1hzbzjw28cisj8xzglp9qhbzzkxv3lg98imxrpswn6xynpdz4n";
rev = "1078dcaff8bab986245b79b26891ef592aeb0cbe";
sha256 = "032czx26x3118j2bqgcqa4c10nknidg4dzpsk43biw66z7l6x5jf";
};
meta.homepage = "https://github.com/Yggdroot/LeaderF/";
};
@ -2448,12 +2448,12 @@ let
lsp-trouble-nvim = buildVimPluginFrom2Nix {
pname = "lsp-trouble-nvim";
version = "2021-05-10";
version = "2021-05-11";
src = fetchFromGitHub {
owner = "folke";
repo = "lsp-trouble.nvim";
rev = "1dd72c22403519c160b0c694762091971bcf191e";
sha256 = "1831ywvbl51zd8m5rkpq59dw6s55snsyv94n28vl316cm65q28ji";
rev = "0f584688c3dcd6a2cacf2e750da7fe3b5e7f260e";
sha256 = "14wfnv98ys0mc9xpfl0d06iv63k4bfhjy8h35sngb0mikb1wb0ns";
};
meta.homepage = "https://github.com/folke/lsp-trouble.nvim/";
};
@ -2496,12 +2496,12 @@ let
lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine-nvim";
version = "2021-05-10";
version = "2021-05-12";
src = fetchFromGitHub {
owner = "hoob3rt";
repo = "lualine.nvim";
rev = "11280b44f2f3812b60e99b7e07e4d37bee418cb0";
sha256 = "0ifbkjsgjilczmqn2lpkw4jl648hns06klx07md9y3sc5i5jqjjq";
rev = "33aaabe672f120050fd34264719e27a9bf518f18";
sha256 = "1zsnhlcch4wgs69zjxdxaczxpi8ypscxgmjc41v2qwk4vmjlqlv1";
};
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
};
@ -3180,12 +3180,12 @@ let
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
version = "2021-05-09";
version = "2021-05-11";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
rev = "91f3c9fb469527a75163b8460128aade3b34e4a5";
sha256 = "19mapmqff6b80g70ybmwp9mc113wal7dgjfsx516dh21gcx3v98h";
rev = "cd8a10b9191ead80802100e00e741dcc89304634";
sha256 = "06s4q9d18j2hanwxardsbbc4dzjwdb5z5xyrn1h2i5dlvfkyj2dl";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
@ -3324,12 +3324,12 @@ let
nvim-hlslens = buildVimPluginFrom2Nix {
pname = "nvim-hlslens";
version = "2021-04-30";
version = "2021-05-12";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-hlslens";
rev = "4ce0b6462b33b3857e5cd9c91c9f9ac33ae0357f";
sha256 = "0n267lvr5sgn1n135bc1bhfxjlkcf2r1ydiccbcqs4mf8kjsj4hw";
rev = "f1fd61642c687f37f14e3f947c840e0f33e4b09a";
sha256 = "0d8bz0khmvrrcpcyrnwagykj4hmbr55a8g39qrwm3zkmry5if4qg";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
};
@ -3444,12 +3444,12 @@ let
nvim-toggleterm-lua = buildVimPluginFrom2Nix {
pname = "nvim-toggleterm-lua";
version = "2021-05-04";
version = "2021-05-11";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-toggleterm.lua";
rev = "53d0820fdacd8a5b3c20397a691b12c84a5a0aaa";
sha256 = "190iw5449ybsaz3y9w5yy5kybr06cih4vkf75jg09lp4mx8z2anb";
rev = "5bf694fce51f0711e3e005e105992178d87a86c6";
sha256 = "1ka3hqcyjbrnawiz4wx35qpql3jxl0vllnskz5vqhqr5gfl9rz5b";
};
meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/";
};
@ -3468,12 +3468,12 @@ let
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2021-05-08";
version = "2021-05-11";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "9e0f764b675d987bbdd45af38531cc864c8cfc4c";
sha256 = "1rw9jasxfxghja5dlfz75iiz5rshisjnwffhzdqa9mil0pvahjr8";
rev = "efbb1c66d27eb5b4bfbcc1f59d3384e0641c8214";
sha256 = "1sfc7890v4lgc7r4a5k922qbnc1lpjp3i8sj1jqqxd4a73x1nsvm";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -3504,12 +3504,12 @@ let
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
version = "2021-04-23";
version = "2021-05-11";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
rev = "522b26a8795994b719a921a03cfacb0d7dcabf78";
sha256 = "0ww1agq33l3jhbfwr5ri9m3ipr48kgwzlzxv96w43x6y29p61g2v";
rev = "4f1ace57fbeed1f4e5613ea8c9b414ff0833eade";
sha256 = "1in2q3igq74m900rkchdcgfcy3h60663b58xn2ydlbjsbzhc7vrn";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
@ -3863,6 +3863,18 @@ let
meta.homepage = "https://github.com/python-mode/python-mode/";
};
QFEnter = buildVimPluginFrom2Nix {
pname = "QFEnter";
version = "2020-10-09";
src = fetchFromGitHub {
owner = "yssl";
repo = "QFEnter";
rev = "df0a75b287c210f98ae353a12bbfdaf73d858beb";
sha256 = "0gdp7nmjlp8ng2rp2v66d8bincnkwrqqpbggb079f0f9szrqlp54";
};
meta.homepage = "https://github.com/yssl/QFEnter/";
};
quick-scope = buildVimPluginFrom2Nix {
pname = "quick-scope";
version = "2020-12-28";
@ -4659,12 +4671,12 @@ let
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
version = "2021-05-09";
version = "2021-05-11";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "c061c216bfe082384d542a487ce02e9aed6177df";
sha256 = "1x4mhxwp9crs63a43wlph4jbl92192sl3hiwchwlim0g1wdar0ky";
rev = "22a78a46364b1e79549267c9365a31684689ed08";
sha256 = "0y0y37v0qikfi7p9a5c63knil70r4mk249hsyxjjgg2m3di8i29g";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@ -5464,12 +5476,12 @@ let
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
version = "2021-05-06";
version = "2021-05-12";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "236919da99a534307e5cf2b204ddf1e3c1a1816e";
sha256 = "0vajjv8nw41n783vsfqy72z4r3m36s7wkfxs96scpga18v3xgqng";
rev = "8c17472d0fe5a515ab3618edd0cad3dd16972e09";
sha256 = "15k2agpi832wdfacf289fffkvgg8q2gc01y9fa8qsnhjqnlrqra9";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@ -7135,12 +7147,12 @@ let
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
version = "2021-05-10";
version = "2021-05-12";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
rev = "ea2612d87a38ef2261f66063571eef06689bbb8e";
sha256 = "0a7dxvl8p3n8kfm1abm1k2r9l6s230585521scgh8y1sh88zkpay";
rev = "f30d2d2d3a60905a09b516f843c130232da10060";
sha256 = "0fj4hn481n5rg7z9hkybzpa6zv1dqc120i6112c8wasl89rg6xl5";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@ -9044,12 +9056,12 @@ let
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
version = "2021-05-03";
version = "2021-05-11";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
rev = "4e04a862cb37105acebac8b6ac5b275dc7865815";
sha256 = "02z5imcj7dqhkjxizcxswikabnbnfx9fnrbqcwgn0xcnf80c5azg";
rev = "2708e8e6ecc00bfd7d9fee923d287345553aba02";
sha256 = "173l5rmg12rqcl7f0lq9f5shx94mf7f8793m74ls1v3k06xdcqj2";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@ -9153,12 +9165,12 @@ let
which-key-nvim = buildVimPluginFrom2Nix {
pname = "which-key-nvim";
version = "2021-05-09";
version = "2021-05-11";
src = fetchFromGitHub {
owner = "folke";
repo = "which-key.nvim";
rev = "1ccba9d0b553b08feaca9f432386f9c33bd1656f";
sha256 = "0qarcdwyd1pbcaqzzhzq4sh8d278j1xxf90ibp6h1451fcvkymid";
rev = "342c8cdb3651967c96c356eb2d79561c0c9273ee";
sha256 = "1v1z8yk711gjd3qawj2vmwa5l9jmqqxfj9jjw9zq1m011msp18iv";
};
meta.homepage = "https://github.com/folke/which-key.nvim/";
};
@ -9335,12 +9347,12 @@ let
zig-vim = buildVimPluginFrom2Nix {
pname = "zig-vim";
version = "2021-04-07";
version = "2021-05-12";
src = fetchFromGitHub {
owner = "ziglang";
repo = "zig.vim";
rev = "fc32adfada0fac7a2f6088672e177d410c9e3ae1";
sha256 = "051l2dig6861xzl6zg41d6a776jhms7v6a86cap1ipd2rxkqh5yh";
rev = "9ec189bc76ed2850f916394ed8d6127290f51338";
sha256 = "0xl2pxgmam5ls7a59bdvx3gyzcgsq3wvgby2c5667627kcq05j6s";
};
meta.homepage = "https://github.com/ziglang/zig.vim/";
};

1
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -772,6 +772,7 @@ ycm-core/YouCompleteMe
Yggdroot/indentLine
Yggdroot/LeaderF
Yilin-Yang/vim-markbar
yssl/QFEnter
yuki-yano/ncm2-dictionary
yunlingz/ci_dark
zah/nim.vim

31
pkgs/os-specific/linux/tiscamera/default.nix
View File

@ -14,24 +14,27 @@
, libunwind
, elfutils
, orc
, python3
, python3Packages
, libuuid
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "tiscamera";
version = "0.11.1";
version = "0.13.1";
src = fetchFromGitHub {
owner = "TheImagingSource";
repo = pname;
rev = "v-${pname}-${version}";
sha256 = "07vp6khgl6qd3a4519dmx1s5bfw7pld793p50pjn29fqh91fm93g";
sha256 = "0hpy9yhc4mn6w8gvzwif703smmcys0j2jqbz2xfghqxcyb0ykplj";
};
nativeBuildInputs = [
cmake
pkg-config
python3Packages.wrapPython
wrapGAppsHook
];
buildInputs = [
@ -47,33 +50,43 @@ stdenv.mkDerivation rec {
libunwind
elfutils
orc
python3
libuuid
python3Packages.python
python3Packages.pyqt5
];
pythonPath = with python3Packages; [ pyqt5 pygobject3 ];
propagatedBuildInputs = pythonPath;
cmakeFlags = [
"-DBUILD_ARAVIS=OFF" # For GigE support. Won't need it as our camera is usb.
"-DBUILD_GST_1_0=ON"
"-DBUILD_TOOLS=ON"
"-DBUILD_V4L2=ON"
"-DBUILD_LIBUSB=ON"
"-DBUILD_TESTS=ON"
"-DTCAM_INSTALL_UDEV=${placeholder "out"}/lib/udev/rules.d"
"-DTCAM_INSTALL_UVCDYNCTRL=${placeholder "out"}/share/uvcdynctrl/data/199e"
"-DTCAM_INSTALL_GST_1_0=${placeholder "out"}/lib/gstreamer-1.0"
"-DTCAM_INSTALL_GIR=${placeholder "out"}/share/gir-1.0"
"-DTCAM_INSTALL_TYPELIB=${placeholder "out"}/lib/girepository-1.0"
"-DTCAM_INSTALL_SYSTEMD=${placeholder "out"}/etc/systemd/system"
"-DTCAM_INSTALL_PYTHON3_MODULES=${placeholder "out"}/lib/${python3Packages.python.libPrefix}/site-packages"
"-DGSTREAMER_1.0_INCLUDEDIR=${placeholder "out"}/include/gstreamer-1.0"
# There are gobject introspection commands launched as part of the build. Those have a runtime
# dependency on `libtcam` (which itself is built as part of this build). In order to allow
# that, we set the dynamic linker's path to point on the build time location of the library.
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
];
postPatch = ''
substituteInPlace ./src/BackendLoader.cpp \
--replace '"libtcam-v4l2.so"' "\"$out/lib/tcam-0/libtcam-v4l2.so\"" \
--replace '"libtcam-aravis.so"' "\"$out/lib/tcam-0/libtcam-aravis.so\"" \
--replace '"libtcam-libusb.so"' "\"$out/lib/tcam-0/libtcam-libusb.so\""
doCheck = true;
# gstreamer tests requires, besides gst-plugins-bad, plugins installed by this expression.
checkPhase = "ctest --force-new-ctest-process -E gstreamer";
postFixup = ''
wrapPythonPrograms "$out $pythonPath"
'';
meta = with lib; {

4
pkgs/os-specific/linux/wireguard/default.nix
View File

@ -7,11 +7,11 @@ assert lib.versionOlder kernel.version "5.6";
stdenv.mkDerivation rec {
pname = "wireguard";
version = "1.0.20210219";
version = "1.0.20210424";
src = fetchzip {
url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";
sha256 = "sha256-ZYZBnfX8DP0IV3VEBSzg7wnFCnlCzOT6Ql3kFZ0klfQ=";
sha256 = "sha256-VLtIxYh308X28c9EOeHx0eA7HP2aRlekPXRt015/qAg=";
};
hardeningDisable = [ "pic" ];

6
pkgs/servers/caddy/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "caddy";
version = "2.3.0";
version = "2.4.0";
subPackages = [ "cmd/caddy" ];
@ -10,10 +10,10 @@ buildGoModule rec {
owner = "caddyserver";
repo = pname;
rev = "v${version}";
sha256 = "03cbbr8z9g156lgx7pyn1p1i4mh8ayhhhv24r1z3h1vgq6y4ka7r";
sha256 = "sha256-gPw6o9B1jV1XQ86zlfrbJqUtVWMWArV8zMHIm6Wkz1M=";
};
vendorSha256 = "0gpzxjiyv7l1nibh1gas4mvinamiyyfgidd8cy4abz95v6z437lp";
vendorSha256 = "sha256-ZOrhR03m+cs+mTQio3qEIf+1B0IP0i2+x+vcml5AMco=";
passthru.tests = { inherit (nixosTests) caddy; };

3
pkgs/servers/hylafaxplus/default.nix
View File

@ -67,6 +67,9 @@ stdenv.mkDerivation {
url = "mirror://sourceforge/hylafax/hylafax-${version}.tar.gz";
inherit sha256;
};
patches = [
./libtiff-4.2.patch # adjust configure check to work with libtiff > 4.1
];
# Note that `configure` (and maybe `faxsetup`) are looking
# for a couple of standard binaries in the `PATH` and
# hardcode their absolute paths in the new package.

13
pkgs/servers/hylafaxplus/libtiff-4.2.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/configure b/configure
index 7456dcb..90f0e8d 100755
--- a/configure
+++ b/configure
@@ -2583,7 +2583,7 @@ EOF
echo '#define TIFFSTRIPBYTECOUNTS uint32'
echo '#define TIFFVERSION TIFF_VERSION'
echo '#define TIFFHEADER TIFFHeader';;
- 4.[01]) tiff_runlen_t="uint32"
+ 4.[012]) tiff_runlen_t="uint32"
tiff_offset_t="uint64"
echo '#define TIFFSTRIPBYTECOUNTS uint64'
echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'

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

@ -12,11 +12,11 @@ let
in
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.33.1";
version = "1.33.2";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-kH5HhkfUL+WzcX/0pK0dV1bI34TpmgRpx3m/UchdAEE=";
sha256 = "sha256-9WZjuVvWpzCR1MjeMXfja/YV2YFHdo7QbjgUWDymCpM=";
};
patches = [

9
pkgs/shells/nushell/default.nix
View File

@ -10,6 +10,8 @@
, libiconv
, AppKit
, Security
, nghttp2
, libgit2
, withStableFeatures ? true
}:
@ -32,10 +34,15 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ]
++ lib.optionals (withStableFeatures && stdenv.isLinux) [ xorg.libX11 ]
++ lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit ];
++ lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ];
cargoBuildFlags = lib.optional withStableFeatures "--features stable";
# TODO investigate why tests are broken on darwin
# failures show that tests try to write to paths
# outside of TMPDIR
doCheck = ! stdenv.isDarwin;
checkPhase = ''
runHook preCheck
echo "Running cargo test"

18
pkgs/tools/misc/broot/default.nix
View File

@ -4,33 +4,39 @@
, fetchCrate
, installShellFiles
, makeWrapper
, pkg-config
, libgit2
, oniguruma
, libiconv
, zlib
, Security
, zlib
}:
rustPlatform.buildRustPackage rec {
pname = "broot";
version = "1.3.1";
version = "1.4.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-Iz9pXvgPIGUnfbnvk5kYAqlrMlz3I2kLszPe8GwwHVk=";
sha256 = "sha256-6UveXa0rMWt5FbmhB0CsYRMGMXxL8FB/XivB4Ec93PY=";
};
cargoHash = "sha256-eECAaTUgqasuDhLSk8p/CWSQmV8yV30UoMy3GZCRbGE=";
cargoHash = "sha256-c6U1ZOaXZ7RnKD7q0WTkam9gL8SL/naSeHGbB5I82lk=";
nativeBuildInputs = [
makeWrapper
installShellFiles
makeWrapper
pkg-config
];
buildInputs = lib.optionals stdenv.isDarwin [
buildInputs = [ libgit2 oniguruma ] ++ lib.optionals stdenv.isDarwin [
libiconv
Security
zlib
];
RUSTONIG_SYSTEM_LIBONIG = true;
postPatch = ''
# Fill the version stub in the man page. We can't fill the date
# stub reproducibly.

4
pkgs/tools/misc/cpulimit/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cpulimit";
version = "2.6";
version = "2.7";
src = fetchurl {
url = "mirror://sourceforge/limitcpu/${pname}-${version}.tar.gz";
sha256 = "0xf0r6zxaqan1drz61nqf95p2pkiiihpvrjhrr9dx9j3vswyx31g";
sha256 = "sha256-HeBApPikDf6MegJf6YB1ZzRo+8P8zMvCMbx0AvYuxKA=";
};
buildFlags = with stdenv; [ (

4
pkgs/tools/misc/librespeed-cli/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "librespeed-cli";
version = "1.0.8";
version = "1.0.9";
src = fetchFromGitHub {
owner = "librespeed";
repo = "speedtest-cli";
rev = "v${version}";
sha256 = "sha256-cbLuAOAGWmYj6xR2AjpwvRXrP3SXfHhjUp5MVLqC0WE=";
sha256 = "sha256-rtZZgx5QNwYd6vXSts/ICSiXv7sMZA8ihHgxTjZ/6KQ=";
};
vendorSha256 = "sha256-psZyyySpY06J+ji+9uHUtX7Ks1hzZC3zINszYP75NfQ=";

3
pkgs/tools/misc/swaglyrics/default.nix
View File

@ -19,7 +19,8 @@ python3.pkgs.buildPythonApplication rec {
substituteInPlace setup.py \
--replace 'requests>=2.24.0' 'requests~=2.23' \
--replace 'beautifulsoup4==4.9.1' 'beautifulsoup4~=4.9' \
--replace 'colorama==0.4.3' 'colorama~=0.4'
--replace 'colorama==0.4.3' 'colorama~=0.4' \
--replace 'unidecode==1.1.1' 'unidecode~=1.2'
'';
preBuild = "export HOME=$NIX_BUILD_TOP";

6
pkgs/tools/networking/sniffglue/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "sniffglue";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "kpcyrd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-bvLkeC5Hm1enaWJtYmnnINgpSO3tlg1SsEzeMSF9OXk=";
sha256 = "sha256-2LyCiW1MrAahpbzyxot0INPMzo0Vl/JToMZTinCQdgs=";
};
cargoSha256 = "sha256-dxE1o7JqGvWwOtuhHgq0t9Zw1wQt5lt1OJJY992jjjA=";
cargoSha256 = "sha256-AGwiyC7Zf8KHQIHfHByL06sdbS4vEXUyj1wGw7Q1N9I=";
nativeBuildInputs = [ pkg-config ];

4
pkgs/tools/networking/wireguard-tools/default.nix
View File

@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "wireguard-tools";
version = "1.0.20210315";
version = "1.0.20210424";
src = fetchzip {
url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz";
sha256 = "sha256-aCqgjriqhBInK7C7KapoKVfgj+zreGQzacMKwbMF1Og=";
sha256 = "sha256-0aGaE4EBb4wb5g32Wugakt7w41sb97Hqqkac7qE641M=";
};
outputs = [ "out" "man" ];

4
pkgs/tools/typesetting/ted/default.nix
View File

@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ pkg-config zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ];
meta = with lib; {
description = "An easy rich text processor";