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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-02-08 00:36:16 +00:00 committed by GitHub
commit 1c86cb40e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 364 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
doc/stdenv/meta.xml
View File

@ -75,7 +75,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
</para>
<variablelist>
<varlistentry>
<varlistentry xml:id="var-meta-description">
<term>
<varname>description</varname>
</term>
@ -94,7 +94,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
</para>
</listitem>
</varlistentry>
<varlistentry>
<varlistentry xml:id="var-meta-longDescription">
<term>
<varname>longDescription</varname>
</term>
@ -104,7 +104,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
</para>
</listitem>
</varlistentry>
<varlistentry>
<varlistentry xml:id="var-meta-branch">
<term>
<varname>branch</varname>
</term>
@ -114,7 +114,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
</para>
</listitem>
</varlistentry>
<varlistentry>
<varlistentry xml:id="var-meta-homepage">
<term>
<varname>homepage</varname>
</term>
@ -124,7 +124,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
</para>
</listitem>
</varlistentry>
<varlistentry>
<varlistentry xml:id="var-meta-downloadPage">
<term>
<varname>downloadPage</varname>
</term>
@ -134,7 +134,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
</para>
</listitem>
</varlistentry>
<varlistentry>
<varlistentry xml:id="var-meta-changelog">
<term>
<varname>changelog</varname>
</term>
@ -144,7 +144,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
</para>
</listitem>
</varlistentry>
<varlistentry>
<varlistentry xml:id="var-meta-license">
<term>
<varname>license</varname>
</term>
@ -183,7 +183,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
</para>
</listitem>
</varlistentry>
<varlistentry>
<varlistentry xml:id="var-meta-maintainers">
<term>
<varname>maintainers</varname>
</term>
@ -193,7 +193,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
</para>
</listitem>
</varlistentry>
<varlistentry>
<varlistentry xml:id="var-meta-priority">
<term>
<varname>priority</varname>
</term>
@ -203,7 +203,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
</para>
</listitem>
</varlistentry>
<varlistentry>
<varlistentry xml:id="var-meta-platforms">
<term>
<varname>platforms</varname>
</term>
@ -217,7 +217,7 @@ meta.platforms = lib.platforms.linux;
</para>
</listitem>
</varlistentry>
<varlistentry>
<varlistentry xml:id="var-meta-tests">
<term>
<varname>tests</varname>
</term>
@ -244,7 +244,7 @@ meta.platforms = lib.platforms.linux;
</para>
</listitem>
</varlistentry>
<varlistentry>
<varlistentry xml:id="var-meta-timeout">
<term>
<varname>timeout</varname>
</term>
@ -254,7 +254,7 @@ meta.platforms = lib.platforms.linux;
</para>
</listitem>
</varlistentry>
<varlistentry>
<varlistentry xml:id="var-meta-hydraPlatforms">
<term>
<varname>hydraPlatforms</varname>
</term>
@ -268,7 +268,7 @@ meta.hydraPlatforms = [];
</para>
</listitem>
</varlistentry>
<varlistentry>
<varlistentry xml:id="var-meta-broken">
<term>
<varname>broken</varname>
</term>
@ -278,7 +278,7 @@ meta.hydraPlatforms = [];
</para>
</listitem>
</varlistentry>
<varlistentry>
<varlistentry xml:id="var-meta-updateWalker">
<term>
<varname>updateWalker</varname>
</term>

6
maintainers/maintainer-list.nix
View File

@ -7101,6 +7101,12 @@
githubId = 15645854;
name = "Brad Christensen";
};
payas = {
email = "relekarpayas@gmail.com";
github = "payasrelekar";
githubId = 24254289;
name = "Payas Relekar";
};
pawelpacana = {
email = "pawel.pacana@gmail.com";
github = "pawelpacana";

12
nixos/tests/snapcast.nix
View File

@ -5,6 +5,7 @@ let
tcpPort = 10005;
httpPort = 10080;
tcpStreamPort = 10006;
bufferSize = 742;
in {
name = "snapcast";
meta = with pkgs.lib.maintainers; {
@ -18,6 +19,7 @@ in {
port = port;
tcp.port = tcpPort;
http.port = httpPort;
buffer = bufferSize;
streams = {
mpd = {
type = "pipe";
@ -35,6 +37,9 @@ in {
};
};
};
client = {
environment.systemPackages = [ pkgs.snapcast ];
};
};
testScript = ''
@ -61,5 +66,12 @@ in {
server.succeed(
"curl --fail http://localhost:${toString httpPort}/jsonrpc -d '{json.dumps(get_rpc_version)}'"
)
with subtest("test a connection"):
client.execute("systemd-run snapclient -h server -p ${toString port}")
server.wait_until_succeeds(
"journalctl -o cat -u snapserver.service | grep -q 'Hello from'"
)
client.wait_until_succeeds("journalctl -o cat -u run-\* | grep -q ${toString bufferSize}")
'';
})

6
pkgs/applications/blockchains/electrs.nix
View File

@ -6,20 +6,20 @@
rustPlatform.buildRustPackage rec {
pname = "electrs";
version = "0.8.6";
version = "0.8.7";
src = fetchFromGitHub {
owner = "romanz";
repo = pname;
rev = "v${version}";
sha256 = "0nnblxz4xr8k083wy3whx8qxqmdzbxsh5gd91161mrnvidganvgb";
sha256 = "101prhxg7dr701gwm4s15maxb7cf65hf85hc7ai53b404v39vm71";
};
# needed for librocksdb-sys
nativeBuildInputs = [ llvmPackages.clang ];
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
cargoSha256 = "11xwjcfc3kqjyp94qzmyb26xwynf4f1q3ac3rp7l7qq1njly07gr";
cargoSha256 = "12ypx0rkpbjl4awzx8ga30qhiqqd56a24q4jwlxxnfpw9ks1z252";
meta = with lib; {
description = "An efficient re-implementation of Electrum Server in Rust";

23
pkgs/applications/editors/ox/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "ox";
version = "0.2.7";
src = fetchFromGitHub {
owner = "curlpipe";
repo = pname;
rev = version;
sha256 = "18iffnmvax6mbnhypf7yma98y5q2zlsyp9q18f92fdwz426r33p0";
};
cargoSha256 = "0v0a1dl9rq5qyy9xwnb59w62qr9db3y3zlmnp60wafvj70zi9zxs";
meta = with lib; {
description = "An independent Rust text editor that runs in your terminal";
homepage = "https://github.com/curlpipe/ox";
changelog = "https://github.com/curlpipe/ox/releases/tag/${version}";
license = licenses.gpl2Only;
maintainers = with maintainers; [ fortuneteller2k ];
};
}

60
pkgs/applications/graphics/ipe/default.nix
View File

@ -1,43 +1,67 @@
{ lib, fetchurl, makeWrapper, pkg-config, zlib, freetype, cairo, lua5, texlive, ghostscript
, libjpeg, libpng, qtbase, mkDerivation
{ lib
, mkDerivation
, fetchurl
, pkg-config
, cairo
, freetype
, ghostscript
, gsl
, libjpeg
, libpng
, libspiro
, lua5
, qtbase
, texlive
, zlib
}:
mkDerivation rec {
name = "ipe-7.2.13";
pname = "ipe";
version = "7.2.23";
src = fetchurl {
url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz";
sha256 = "1a6a88r7j5z01z6k1z72a8g3n6lxdjjxxkdrzrfdd6df2gbs6g5g";
url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${pname}-${version}-src.tar.gz";
sha256 = "0yvm3zfba1ljyy518vjnvwpyg7lgnmdwm19v5k0wfgz64aca56x1";
};
sourceRoot = "${name}/src";
sourceRoot = "${pname}-${version}/src";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
cairo
freetype
ghostscript
gsl
libjpeg
libpng
libspiro
lua5
qtbase
texlive
zlib
];
IPEPREFIX=placeholder "out";
URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/";
LUA_PACKAGE = "lua";
buildInputs = [
libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript
];
nativeBuildInputs = [ pkg-config ];
qtWrapperArgs = [ "--prefix PATH : ${texlive}/bin" ];
enableParallelBuilding = true;
#TODO: make .desktop entry
# TODO: make .desktop entry
meta = {
meta = with lib; {
description = "An editor for drawing figures";
homepage = "http://ipe.otfried.org";
license = lib.licenses.gpl3Plus;
homepage = "http://ipe.otfried.org"; # https not available
license = licenses.gpl3Plus;
longDescription = ''
Ipe is an extensible drawing editor for creating figures in PDF and Postscript format.
It supports making small figures for inclusion into LaTeX-documents
as well as presentations in PDF.
'';
maintainers = [ lib.maintainers.ttuegel ];
platforms = lib.platforms.linux;
maintainers = with maintainers; [ ttuegel ];
platforms = platforms.linux;
};
}

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

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "wofi";
version = "1.2.3";
version = "1.2.4";
src = fetchhg {
url = "https://hg.sr.ht/~scoopta/wofi";
rev = "v${version}";
sha256 = "0glpb2gf5n78s01z3rn614ak8ibxhfr824gy6xlljbxclgds264i";
sha256 = "1bnf078fg1kwslzwm1mjxwcqqq3bhk1dzymwfw9gk3brqbxrl75c";
};
nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ];
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A launcher/menu program for wlroots based wayland compositors such as sway";
homepage = "https://hg.sr.ht/~scoopta/wofi";
license = licenses.gpl3;
license = licenses.gpl3Only;
maintainers = with maintainers; [ elyhaka ];
platforms = with platforms; linux;
};

36
pkgs/applications/networking/browsers/chromium/README.md
View File

@ -1,11 +1,11 @@
# Maintainers
- TODO: We need more maintainers:
- https://github.com/NixOS/nixpkgs/issues/78450
- If you just want to help out without becoming a maintainer:
- Look for open Nixpkgs issues or PRs related to Chromium
- Make your own PRs (but please try to make reviews as easy as possible)
- Primary maintainer (responsible for updating Chromium): @primeos
- Note: We could always use more contributors, testers, etc. E.g.:
- A dedicated maintainer for the NixOS stable channel
- PRs with cleanups, improvements, fixes, etc. (but please try to make reviews
as easy as possible)
- People who handle stale issues/PRs
- Primary maintainer (responsible for all updates): @primeos
- Testers (test all stable channel updates)
- `nixos-unstable`:
- `x86_64`: @danielfullmer
@ -13,11 +13,14 @@
- Stable channel:
- `x86_64`: @Frostman
- Other relevant packages:
- `chromiumBeta` and `chromiumDev`: For testing purposes (not build on Hydra)
- `chromiumBeta` and `chromiumDev`: For testing purposes only (not build on
Hydra). We use these channels for testing and to fix build errors in advance
so that `chromium` updates are trivial and can be merged fast.
- `google-chrome`, `google-chrome-beta`, `google-chrome-dev`: Updated via
Chromium's `upstream-info.json`
- `ungoogled-chromium`: Based on `chromium` (the expressions are regularly
copied over and patched accordingly)
- `ungoogled-chromium`: @squalus
- `chromedriver`: Updated via Chromium's `upstream-info.json` and not built
from source.
# Upstream links
@ -36,6 +39,11 @@ update `upstream-info.json`. After updates it is important to test at least
`nixosTests.chromium` (or basic manual testing) and `google-chrome` (which
reuses `upstream-info.json`).
Note: The source tarball is often only available a few hours after the release
was announced. The CI/CD status can be tracked here:
- https://ci.chromium.org/p/infra/builders/cron/publish_tarball
- https://ci.chromium.org/p/infra/builders/cron/publish_tarball_dispatcher
To run all automated NixOS VM tests for Chromium, ungoogled-chromium,
and Google Chrome (not recommended, currently 6x tests!):
```
@ -79,3 +87,13 @@ that a new major release of LLVM is required.
Those channels are only used to test and fix builds in advance. They may be
broken at times and must not delay stable channel updates.
# Testing
Useful tests:
- Version: chrome://version/
- GPU acceleration: chrome://gpu/
- Essential functionality: Browsing, extensions, video+audio, JS, ...
- WebGL: https://get.webgl.org/
- VA-API: https://wiki.archlinux.org/index.php/chromium#Hardware_video_acceleration
- Optional: Widevine CDM (proprietary), Benchmarks, Ozone, etc.

4
pkgs/applications/networking/browsers/firefox/common.nix
View File

@ -8,7 +8,7 @@
, yasm, libGLU, libGL, sqlite, unzip, makeWrapper
, hunspell, libXdamage, libevent, libstartup_notification
, libvpx_1_8
, icu67, libpng, jemalloc, glib
, icu67, libpng, jemalloc, glib, pciutils
, autoconf213, which, gnused, rustPackages, rustPackages_1_45
, rust-cbindgen, nodejs, nasm, fetchpatch
, gnum4
@ -182,6 +182,8 @@ buildStdenv.mkDerivation ({
postPatch = ''
rm -rf obj-x86_64-pc-linux-gnu
substituteInPlace toolkit/xre/glxtest.cpp \
--replace 'dlopen("libpci.so' 'dlopen("${pciutils}/lib/libpci.so'
'' + lib.optionalString (pipewireSupport && lib.versionOlder ffversion "83") ''
# substitute the /usr/include/ lines for the libraries that pipewire provides.
# The patch we pick from fedora only contains the generated moz.build files

6
pkgs/applications/networking/cluster/helmfile/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helmfile";
version = "0.138.2";
version = "0.138.4";
src = fetchFromGitHub {
owner = "roboll";
repo = "helmfile";
rev = "v${version}";
sha256 = "sha256-hy673acO9/fJL/80VTnQS8t9jXb7y9KVSVa0Zmja4uk=";
sha256 = "sha256-Y0/0wC00s7QY7/B6igOoPKXv5TE2P8NoGd9UhfVmLOk=";
};
vendorSha256 = "sha256-BWWmdKrxay0Qy5z+UFFZ3we5C7wI1KUHv6qHF4TPzJE=";
vendorSha256 = "sha256-WlV6moJymQ7VyZXXuViCNN1WP4NzBUszavxpKjQR8to=";
doCheck = false;

8
pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix
View File

@ -2,19 +2,19 @@
, fetchurl
, appimageTools
, makeWrapper
, electron_9
, electron_10
}:
let
electron = electron_9;
electron = electron_10;
in
stdenv.mkDerivation rec {
pname = "jitsi-meet-electron";
version = "2.3.1";
version = "2.4.2";
src = fetchurl {
url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage";
sha256 = "0af87lvqw3sagi2cayripm62q17nfd841xz0ghvbixzfnqkvgf7x";
sha256 = "1lv3ca9qlggyb8vcg8zlxv46i8fgx5qrx7i7y71dlqblajalf42p";
name = "${pname}-${version}.AppImage";
};

4
pkgs/applications/science/biology/picard-tools/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "picard-tools";
version = "2.24.1";
version = "2.24.2";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
sha256 = "sha256-acCsYHyZ358hYqa2haOxR+g6FQGtK+hstYfLBvHLwR8=";
sha256 = "sha256-O+bA7vP7Y9AbFA+nEjE6O1i0DcAWVLO2Guw0ntq55s4=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/applications/system/glances/default.nix
View File

@ -9,14 +9,14 @@
buildPythonApplication rec {
pname = "glances";
version = "3.1.6.1";
version = "3.1.6.2";
disabled = isPyPy;
src = fetchFromGitHub {
owner = "nicolargo";
repo = "glances";
rev = "v${version}";
sha256 = "sha256-lYvFNeCuvLIV//fEQDZIj+nLGZmrKHfAQyNpe4vMmfU=";
sha256 = "sha256-6vxJKIwMKz8KQn10aOzqXhVBDfBLylw925hR1hWP7/A=";
};
# Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):

8
pkgs/development/libraries/jsoncpp/default.nix
View File

@ -13,6 +13,14 @@ stdenv.mkDerivation rec {
sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv";
};
patches = [
# Fix for https://github.com/open-source-parsers/jsoncpp/issues/1235.
(fetchpatch {
url = "https://github.com/open-source-parsers/jsoncpp/commit/ac2870298ed5b5a96a688d9df07461b31f83e906.patch";
sha256 = "02wswhiwypmf1jn3rj9q1fw164kljiv4l8h0q6wyijzr77hq4wsg";
})
];
/* During darwin bootstrap, we have a cp that doesn't understand the
* --reflink=auto flag, which is used in the default unpackPhase for dirs
*/

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

@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
name = if extraOnly
then "libfm-extra-${version}"
else "libfm-${version}";
version = "1.3.1";
version = "1.3.2";
src = fetchurl {
url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz";
sha256 = "1r6gl49xrykldwz8y4h2s7gjarxigg3bbkrj0gphxjj1vr5j9ccn";
sha256 = "sha256-pQQmMDBM+OXYz/nVZca9VG8ii0jJYBU+02ajTofK0eU=";
};
nativeBuildInputs = [ vala pkg-config intltool ];

14
pkgs/development/libraries/sundials/default.nix
View File

@ -1,7 +1,6 @@
{ lib, stdenv
, cmake
, fetchurl
, fetchpatch
, python
, blas
, lapack
@ -13,24 +12,15 @@
stdenv.mkDerivation rec {
pname = "sundials";
version = "5.6.1";
version = "5.7.0";
outputs = [ "out" "examples" ];
src = fetchurl {
url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
sha256 = "Frd5mex+fyFXqh0Eyh3kojccqBUOBW0klR0MWJZvKoM=";
sha256 = "jW3QlP7Mu41uzEE0DsFqZfq6yC7UQVAj9tfBwjkOovM=";
};
patches = [
# Fixing an upstream regression in treating cmake prefix directories:
# https://github.com/LLNL/sundials/pull/58
(fetchpatch {
url = "https://github.com/LLNL/sundials/commit/dd32ff9baa05618f36e44aadb420bbae4236ea1e.patch";
sha256 = "kToAuma+2iHFyL1v/l29F3+nug4AdK5cPG6IcXv2afc=";
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [

26
pkgs/development/python-modules/django-cache-url/default.nix
View File

@ -1,29 +1,29 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytest
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec {
version = "3.1.2";
version = "3.2.2";
pname = "django-cache-url";
src = fetchPypi {
inherit pname version;
sha256 = "d0ee0d6c5daab92787bff47a4a6f5a6cf97c3c80d81a990820b2af16e12ad65a";
src = fetchFromGitHub {
owner = "epicserve";
repo = "django-cache-url";
rev = "v${version}";
sha256 = "0fxma2w6zl3cfl6wnynmlmp8snks67ffz4jcq4qmdc65xv1l204l";
};
checkInputs = [ pytest ];
checkPhase = ''
pytest tests
postPatch = ''
# disable coverage tests
sed -i '/--cov/d' setup.cfg
'';
# tests not included with pypi release
doCheck = false;
checkInputs = [ pytestCheckHook ];
meta = with lib; {
homepage = "https://github.com/ghickman/django-cache-url";
homepage = "https://github.com/epicserve/django-cache-url";
description = "Use Cache URLs in your Django application";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];

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

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
version = "1.14.1";
version = "1.14.2";
disabled = isPy27;
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = "jc";
rev = "v${version}";
sha256 = "1vzzz7dlg6apxhcl0qkfdpp2v9d0q6jyafpfmklkcbjs31zvwcsw";
sha256 = "sha256-rYH4m7h2SPB1Io83ZUsqZ+Ll4XEi4Feuj4QYvaOJ2lY=";
};
propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ];

34
pkgs/development/python-modules/pynuki/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, requests
}:
buildPythonPackage rec {
pname = "pynuki";
version = "1.4.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "pschmitt";
repo = pname;
rev = version;
sha256 = "1nymlrf0j430851plp355697p55asfxjmavdh2zr96b16d41dnn4";
};
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [ requests ];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "pynuki" ];
meta = with lib; {
description = "Python bindings for nuki.io bridges";
homepage = "https://github.com/pschmitt/pynuki";
license = with licenses; [ gpl3Only ];
maintainers = with maintainers; [ fab ];
};
}

15
pkgs/development/python-modules/teslajsonpy/default.nix
View File

@ -1,26 +1,37 @@
{ lib
, aiohttp
, backoff
, beautifulsoup4
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, pytestCheckHook
, wrapt
}:
buildPythonPackage rec {
pname = "teslajsonpy";
version = "0.11.0";
version = "0.11.5";
src = fetchFromGitHub {
owner = "zabuldon";
repo = pname;
rev = "v${version}";
sha256 = "sha256-yfaUa12doOvdFkbHHdOYcFcu86hYZtt2i0tya2ENjf4=";
sha256 = "sha256-s0IZ1UNldYddaR3zJoYS6ey8Kjxd1fr4fOwf0gNNbow=";
};
patches = [
(fetchpatch {
name = "dont-use-dummpy-module-bs4.patch";
url = "https://github.com/zabuldon/teslajsonpy/pull/138/commits/f5a788e47d8338c8ebb06d954f802ba1ec614db3.patch";
sha256 = "0rws7fhxmca8d5w0bkygx8scvzah3yvb3yfhn05qmp73mn3pmcb3";
})
];
propagatedBuildInputs = [
aiohttp
backoff
beautifulsoup4
wrapt
];

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

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

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

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "xknx";
version = "0.16.2";
version = "0.16.3";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "XKNX";
repo = pname;
rev = version;
sha256 = "14cx54ia38ifz7c750i8jxcmnybzwh03ds6hinlwhx8hd2cx9knj";
sha256 = "sha256-toB66woREkFUv3J14wwquRo+uAOgXKO+cwFgyw4Mma8=";
};
propagatedBuildInputs = [

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -561,7 +561,7 @@
"nsw_rural_fire_service_feed" = ps: with ps; [ ]; # missing inputs: aio_geojson_nsw_rfs_incidents
"nuheat" = ps: with ps; [ ]; # missing inputs: nuheat
"nuimo_controller" = ps: with ps; [ ]; # missing inputs: --only-binary=all nuimo
"nuki" = ps: with ps; [ ]; # missing inputs: pynuki
"nuki" = ps: with ps; [ pynuki ];
"numato" = ps: with ps; [ ]; # missing inputs: numato-gpio
"number" = ps: with ps; [ ];
"nut" = ps: with ps; [ ]; # missing inputs: pynut2

2
pkgs/servers/home-assistant/default.nix
View File

@ -198,6 +198,8 @@ in with py.pkgs; buildPythonApplication rec {
# keyring.errors.NoKeyringError: No recommended backend was available.
"test_secrets_from_unrelated_fails"
"test_secrets_credstash"
# system_log/test_init.py: assert 0 == 1 where 0 = len([])
"test_error_posted_as_event"
];
preCheck = ''

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

@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
version = "1.21.2.3943-a91458577";
version = "1.21.3.4014-58bd20c02";
pname = "plexmediaserver";
# Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
sha256 = "1wgv37z1j8yh0jck8nawq8qk6vjvc2cap2dj2vdid9dafy9fl7yw";
sha256 = "15zfhjvp5yzai5ylhljw221v6qm16fma0x0lay9zpgkxrwqw9iaw";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
sha256 = "0bjxb2kmq43fi8026jvdbqn14lg33k2520n59l497la56l5d0h37";
sha256 = "1gig4n6iijipf2njixgpw00pm3g5rgbq1vvd9ljy8cjpv1kb5z0z";
};
outputs = [ "out" "basedb" ];

4
pkgs/tools/filesystems/squashfs-tools-ng/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "squashfs-tools-ng";
version = "1.0.1";
version = "1.0.4";
src = fetchurl {
url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz";
sha256 = "120x2hlbhpm90bzxz70z764552ffrjpidmp1y6gafx70zp0hrks4";
sha256 = "04zvpws1nk3r2kr1k5in9di9fhn4zzciyndgnxnijmhiqpyrx072";
};
nativeBuildInputs = [ doxygen graphviz pkg-config perl ];

19
pkgs/tools/misc/edir/default.nix Normal file
View File

@ -0,0 +1,19 @@
{ lib, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "edir";
version = "2.7.3";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "06nsy9ikljc437368l38hsw75whacn3j6jwmdgg766q61pnifhkp";
};
meta = with lib; {
description = "Program to rename and remove files and directories using your editor";
homepage = "https://github.com/bulletmark/edir";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ guyonvarch ];
platforms = platforms.all;
};
}

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "jdupes";
version = "1.19.0";
version = "1.19.1";
src = fetchFromGitHub {
owner = "jbruchon";
repo = "jdupes";
rev = "v${version}";
sha256 = "1f6qv701c4c9s4hliha7kp8wraq4jfx1jdk86ii10akkm07fkdlz";
sha256 = "sha256-1gx3rStqIxLt/iRgpdp5z7tX1/wA0miZ1y5WTeGQ1Vs=";
# Unicode file names lead to different checksums on HFS+ vs. other
# filesystems because of unicode normalisation. The testdir
# directories have such files and will be removed.

39
pkgs/tools/misc/upterm/default.nix Normal file
View File

@ -0,0 +1,39 @@
{ lib
, buildGoModule
, fetchFromGitHub
, installShellFiles }:
buildGoModule rec {
pname = "upterm";
version = "0.5.2";
src = fetchFromGitHub {
owner = "owenthereal";
repo = "upterm";
rev = "v${version}";
sha256 = "007hgkkn1cq1i0rkn45i3bz5q9irzm67cz0j5glr6f6d4s0nkjiq";
};
vendorSha256 = null;
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
$out/bin/gendoc
rm $out/bin/gendoc
installManPage etc/man/man*/*
installShellCompletion --bash --name upterm.bash etc/completion/upterm.bash_completion.sh
installShellCompletion --zsh --name _upterm etc/completion/upterm.zsh_completion
'';
doCheck = true;
__darwinAllowLocalNetworking = true;
meta = with lib; {
description = "Secure terminal-session sharing";
homepage = "https://upterm.dev";
license = licenses.asl20;
maintainers = with maintainers; [ hax404 ];
};
}

34
pkgs/tools/networking/ht-rust/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, Security }:
rustPlatform.buildRustPackage rec {
pname = "ht-rust";
version = "0.5.0";
src = fetchFromGitHub {
owner = "ducaale";
repo = "ht";
rev = "v${version}";
sha256 = "cr/iavCRdFYwVR6Iemm1hLKqd0OFG1iDmxpQ9fiwOmU=";
};
cargoSha256 = "uB23/9AjPwCwf9ljE8ai7zJQZqE0SoBPzRqqBOXa9QA=";
buildInputs = [ ] ++ lib.optional stdenv.isDarwin Security;
# Symlink to avoid conflict with pre-existing ht package
postInstall = ''
ln -s $out/bin/ht $out/bin/ht-rust
'';
doInstallCheck = true;
postInstallCheck = ''
$out/bin/ht-rust --help > /dev/null
'';
meta = with lib; {
description = "Yet another HTTPie clone in Rust";
homepage = "https://github.com/ducaale/ht";
license = licenses.mit;
maintainers = [ maintainers.payas ];
};
}

25
pkgs/tools/package-management/apk-tools/default.nix
View File

@ -1,20 +1,29 @@
{ stdenv, lib, fetchurl, lua, openssl, pkg-config, zlib }:
{ lib, stdenv, fetchFromGitLab, pkg-config, scdoc, openssl, zlib
, luaSupport ? stdenv.hostPlatform == stdenv.buildPlatform, lua
}:
stdenv.mkDerivation rec {
pname = "apk-tools";
version = "2.10.5";
version = "2.12.2";
src = fetchurl {
url = "https://dev.alpinelinux.org/archive/apk-tools/apk-tools-${version}.tar.xz";
sha256 = "00z3fqnv8vk2czdm4p2q4sldq0n8sxyf2qfwppyk7wj59d2sq8dp";
src = fetchFromGitLab {
domain = "gitlab.alpinelinux.org";
owner = "alpine";
repo = "apk-tools";
rev = "v${version}";
sha256 = "1crx2xlswi7i0mwgzrfphpf49ghfnh79fi5dn1sl611j9sy9wa29";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ lua openssl zlib ];
nativeBuildInputs = [ pkg-config scdoc ]
++ lib.optionals luaSupport [ lua lua.pkgs.lua-zlib ];
buildInputs = [ openssl zlib ] ++ lib.optional luaSupport lua;
strictDeps = true;
makeFlags = [
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
"SBINDIR=$(out)/bin"
"LIBDIR=$(out)/lib"
"LUA=${if luaSupport then "lua" else "no"}"
"LUA_LIBDIR=$(out)/lib/lua/${lib.versions.majorMinor lua.version}"
"MANDIR=$(out)/share/man"
"DOCDIR=$(out)/share/doc/apk"
@ -30,7 +39,7 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.alpinelinux.org/alpine/apk-tools";
description = "Alpine Package Keeper";
maintainers = with maintainers; [ qyliss ];
license = licenses.gpl2;
license = licenses.gpl2Only;
platforms = platforms.unix;
broken = stdenv.isDarwin;
};

4
pkgs/tools/text/reckon/Gemfile.lock
View File

@ -4,7 +4,7 @@ GEM
chronic (0.10.2)
highline (2.0.3)
rchardet (1.8.0)
reckon (0.6.0)
reckon (0.7.1)
chronic (>= 0.3.0)
highline (>= 1.5.2)
rchardet (>= 1.8.0)
@ -16,4 +16,4 @@ DEPENDENCIES
reckon
BUNDLED WITH
2.1.4
1.17.2

2
pkgs/tools/text/reckon/default.nix
View File

@ -15,8 +15,10 @@ stdenv.mkDerivation rec {
gemdir = ./.;
};
in ''
runHook preInstall
mkdir -p $out/bin
makeWrapper ${env}/bin/reckon $out/bin/reckon
runHook postInstall
'';
passthru.updateScript = bundlerUpdateScript "reckon";

10
pkgs/tools/text/reckon/gemset.nix
View File

@ -1,5 +1,7 @@
{
chronic = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn";
@ -11,7 +13,7 @@
groups = ["default"];
platforms = [];
source = {
remotes = ["http://rubygems.org"];
remotes = ["https://rubygems.org"];
sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d";
type = "gem";
};
@ -21,7 +23,7 @@
groups = ["default"];
platforms = [];
source = {
remotes = ["http://rubygems.org"];
remotes = ["https://rubygems.org"];
sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9";
type = "gem";
};
@ -33,9 +35,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zkbmwx5bp2dr54bwhkn831918ijwh022rq45qg38wz2skih7izp";
sha256 = "0hsmzjxj1f5ma816gag1b3bdjbynhj2szgar955fcs3gbbzv4sk7";
type = "gem";
};
version = "0.6.0";
version = "0.7.1";
};
}

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

@ -3736,6 +3736,8 @@ in
edid-generator = callPackage ../tools/misc/edid-generator { };
edir = callPackage ../tools/misc/edir { };
editres = callPackage ../tools/graphics/editres { };
edit = callPackage ../applications/editors/edit { };
@ -5824,6 +5826,8 @@ in
np2kai = callPackage ../misc/emulators/np2kai { };
ox = callPackage ../applications/editors/ox { };
file-rename = callPackage ../tools/filesystems/file-rename { };
kcollectd = libsForQt5.callPackage ../tools/misc/kcollectd {};
@ -8559,6 +8563,8 @@ in
up = callPackage ../tools/misc/up { };
upterm = callPackage ../tools/misc/upterm { };
upx = callPackage ../tools/compression/upx { };
uq = callPackage ../misc/uq { };
@ -22663,6 +22669,10 @@ in
ht = callPackage ../applications/editors/ht { };
ht-rust = callPackage ../tools/networking/ht-rust {
inherit (darwin.apple_sdk.frameworks) Security;
};
hubstaff = callPackage ../applications/misc/hubstaff { };
hue-cli = callPackage ../tools/networking/hue-cli { };

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

@ -4905,6 +4905,8 @@ in {
pynndescent = callPackage ../development/python-modules/pynndescent { };
pynuki = callPackage ../development/python-modules/pynuki { };
pysbd = callPackage ../development/python-modules/pysbd { };
python-codon-tables = callPackage ../development/python-modules/python-codon-tables { };