Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-04-22 00:16:19 +00:00 committed by GitHub
commit b28a233fef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 319 additions and 36 deletions

View File

@ -83,6 +83,52 @@ If a security fix applies to both master and a stable release then, similar to r
Critical security fixes may by-pass the staging branches and be delivered directly to release branches such as `master` and `release-*`.
## Deprecating/removing packages {#submitting-changes-deprecating-packages}
There is currently no policy when to remove a package.
Before removing a package, one should try to find a new maintainer or fix smaller issues first.
### Steps to remove a package from Nixpkgs
We use jbidwatcher as an example for a discontinued project here.
1. Have Nixpkgs checked out locally and up to date.
1. Create a new branch for your change, e.g. `git checkout -b jbidwatcher`
1. Remove the actual package including its directory, e.g. `rm -rf pkgs/applications/misc/jbidwatcher`
1. Remove the package from the list of all packages (`pkgs/top-level/all-packages.nix`).
1. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/misc/vim-plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.)
For example in this case:
```
jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # added 2021-03-15
```
The throw message should explain in short why the package was removed for users that still have it installed.
1. Test if the changes introduced any issues by running `nix-env -qaP -f . --show-trace`. It should show the list of packages without errors.
1. Commit the changes. Explain again why the package was removed. If it was declared discontinued upstream, add a link to the source.
```ShellSession
$ git add pkgs/applications/misc/jbidwatcher/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/aliases.nix
$ git commit
```
Example commit message:
```
jbidwatcher: remove
project was discontinued in march 2021. the program does not work anymore because ebay changed the login.
https://web.archive.org/web/20210315205723/http://www.jbidwatcher.com/
```
1. Push changes to your GitHub fork with `git push`
1. Create a pull request against Nixpkgs. Mention the package maintainer.
This is how the pull request looks like in this case: [https://github.com/NixOS/nixpkgs/pull/116470](https://github.com/NixOS/nixpkgs/pull/116470)
## Pull Request Template {#submitting-changes-pull-request-template}
The pull request template helps determine what steps have been made for a contribution so far, and will help guide maintainers on the status of a change. The motivation section of the PR should include any extra details the title does not address and link any existing issues related to the pull request.

View File

@ -296,7 +296,7 @@ in {
systemd.sockets.ipfs-api = {
wantedBy = [ "sockets.target" ];
# We also include "%t/ipfs.sock" because tere is no way to put the "%t"
# We also include "%t/ipfs.sock" because there is no way to put the "%t"
# in the multiaddr.
socketConfig.ListenStream = let
fromCfg = multiaddrToListenStream cfg.apiAddress;

View File

@ -19,7 +19,7 @@ in
default = null;
example = "ondemand";
description = ''
Configure the governor used to regulate the frequence of the
Configure the governor used to regulate the frequency of the
available CPUs. By default, the kernel configures the
performance governor, although this may be overwritten in your
hardware-configuration.nix file.

View File

@ -16,7 +16,7 @@
let
pname = "TeXmacs";
version = "1.99.18";
version = "1.99.19";
common = callPackage ./common.nix {
inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;
};
@ -26,7 +26,7 @@ mkDerivation {
src = fetchurl {
url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
sha256 = "0il3fwgw20421aj90wg8kyhkwk6lbgb3bb2g5qamh5lk90yj725i";
sha256 = "1izwqb0z4gqiglv57mjswk6sjivny73kd2sxrf3nmj7wr12pn5m8";
};
nativeBuildInputs = [ cmake pkg-config ];

View File

@ -1,8 +1,8 @@
{
"stable": {
"version": "90.0.4430.72",
"sha256": "0hw916j55lm3qnidfp92i8w6zywdd47rhihn9pn23b7ziz58ik55",
"sha256bin64": "0k1m786b94kh7r2c58qj8b9a39yr4m30kkrxk5d9q7dn1abl3wa3",
"version": "90.0.4430.85",
"sha256": "08j9shrc6p0vpa3x7av7fj8wapnkr7h6m8ag1gh6gaky9d6mki81",
"sha256bin64": "0li9w6zfsmx5r90jm5v5gfv3l2a76jndg6z5jvb9yx9xvrp9gpir",
"deps": {
"gn": {
"version": "2021-02-09",

View File

@ -88,19 +88,19 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "10.0.15";
version = "10.0.16";
lang = "en-US";
srcs = {
x86_64-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
sha256 = "1ah69jmfgik063f9gkvyv9d4k706pqihmzc4k7cc95zyd17v8wrs";
sha256 = "07h2gd6cwwq17lrwjpfah1xvr8ny8700qvi971qacrr7ssicw2pw";
};
i686-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
sha256 = "0gyhxfs4qpg6ys038d52cxnmb4khbng1w4hcsavi2rlgv18bz75p";
sha256 = "145kniiby5nnd0ll3v2gggzxz52bqbrdp72hvh96i8qnzi0fq25a";
};
};
in

View File

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, installShellFiles
@ -16,13 +17,13 @@
buildGoModule rec {
pname = "podman";
version = "3.1.1";
version = "3.1.2";
src = fetchFromGitHub {
owner = "containers";
repo = "podman";
rev = "v${version}";
sha256 = "1ihpz50c50frw9nrjp0vna2lg50kwlar6y6vr4s5sjiwza1qv2d2";
sha256 = "sha256-PS41e7myv5xCSJIeT+SRj4rLVCXpthq7KeHisYoSiOE=";
};
patches = [

View File

@ -19,6 +19,7 @@
, libsoup
, libstartup_notification
, libXtst
, libXdamage
, muffin
, networkmanager
, pkg-config
@ -79,6 +80,7 @@ stdenv.mkDerivation rec {
libsoup
libstartup_notification
libXtst
libXdamage
muffin
networkmanager
pkg-config

View File

@ -1,4 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }:
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop
, libXdamage, libXpresent, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "marco";
@ -20,6 +21,8 @@ stdenv.mkDerivation rec {
libxml2
libcanberra-gtk3
libgtop
libXdamage
libXpresent
libstartup_notification
gtk3
gnome3.zenity

View File

@ -10,13 +10,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "vapoursynth";
version = "R52";
version = "R53";
src = fetchFromGitHub {
owner = "vapoursynth";
repo = "vapoursynth";
rev = version;
sha256 = "1krfdzc2x2vxv4nq9kiv1c09hgj525qn120ah91fw2ikq8ldvmx4";
sha256 = "0qcsfkpkry0cmvi60khjwvfz4fqhy23nqmn4pb9qrwll26sn9dcr";
};
patches = [

View File

@ -2,11 +2,11 @@
buildDunePackage rec {
pname = "ppx_irmin";
version = "2.5.2";
version = "2.5.3";
src = fetchurl {
url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz";
sha256 = "ac8d75144cafdaf4b5e106b540a27338245510b7e33a8c412d393c9d50cae490";
sha256 = "2c8ef24cc57379c3a138f121fea350ee7b6077abc22a4fdc6a47d0c81585f3f6";
};
minimumOCamlVersion = "4.08";

View File

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
let
pname = "composer";
version = "2.0.11";
version = "2.0.12";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar";
sha256 = "sha256-6r8pFwcglqlGeRk3YlATGeYh4rNppKElaywn9OaYRHc=";
sha256 = "sha256-guqMFTfPrOt+VvYATHzN+Z3a/OcjfAc3TZIOY1cwpjE=";
};
dontUnpack = true;

View File

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pyserial
, pyserial-asyncio
, pytestCheckHook
, pytz
, tailer
}:
buildPythonPackage rec {
pname = "dsmr-parser";
version = "0.29";
src = fetchFromGitHub {
owner = "ndokter";
repo = "dsmr_parser";
rev = "v${version}";
sha256 = "11d6cwmabzc8p6jkqwj72nrj7p6cxbvr0x3jdrxyx6zki8chyw4p";
};
propagatedBuildInputs = [
pyserial
pyserial-asyncio
pytz
tailer
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "dsmr_parser" ];
meta = with lib; {
description = "Python module to parse Dutch Smart Meter Requirements (DSMR)";
homepage = "https://github.com/ndokter/dsmr_parser";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,52 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, poetry-core
, pytest-aiohttp
, pytest-asyncio
}:
buildPythonPackage rec {
pname = "hyperion-py";
version = "0.7.4";
disabled = pythonOlder "3.8";
format = "pyproject";
src = fetchFromGitHub {
owner = "dermotduffy";
repo = pname;
rev = "v${version}";
sha256 = "00x12ppmvlxs3qbdxq06wnzakvwm2m39qhmpp27qfpl137b0qqyj";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
];
checkInputs = [
pytest-asyncio
pytest-aiohttp
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --timeout=9 --cov=hyperion" ""
'';
pythonImportsCheck = [ "hyperion" ];
meta = with lib; {
description = "Python package for Hyperion Ambient Lighting";
homepage = "https://github.com/dermotduffy/hyperion-py";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pysonos";
version = "0.0.40";
version = "0.0.43";
disabled = !isPy3k;
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "amelchio";
repo = pname;
rev = "v${version}";
sha256 = "0a0c7jwv39nbvpdcx32sd8kjmj4nyrd7k0yxhpmxdnx4zr4vvzqg";
sha256 = "sha256-OobKlAymXXvQH6m77Uqn2eoTlWgs8EBxYIDFJ5wwMKA=";
};
propagatedBuildInputs = [ ifaddr requests xmltodict ];

View File

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, python
}:
buildPythonPackage rec {
pname = "tailer";
version = "0.4.1";
src = fetchFromGitHub {
owner = "six8";
repo = "pytailer";
rev = version;
sha256 = "1s5p5m3q9k7r1m0wx5wcxf20xzs0rj14qwg1ydwhf6adr17y2w5y";
};
checkPhase = ''
runHook preCheck
${python.interpreter} -m doctest -v src/tailer/__init__.py
runHook postCheck
'';
pythonImportsCheck = [ "tailer" ];
meta = with lib; {
description = "Python implementation implementation of GNU tail and head";
homepage = "https://github.com/six8/pytailer";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, untokenize
, python
}:
buildPythonPackage rec {
pname = "unify";
version = "0.5";
# PyPi release is missing tests (see https://github.com/myint/unify/pull/18)
src = fetchFromGitHub {
owner = "myint";
repo = "unify";
rev = "v${version}";
sha256 = "1l6xxygaigacsxf0g5f7w5gpqha1ava6mcns81kqqy6vw91pyrbi";
};
propagatedBuildInputs = [ untokenize ];
checkPhase = "${python.interpreter} -m unittest discover";
meta = with lib; {
description = "Modifies strings to all use the same quote where possible";
homepage = "https://github.com/myint/unify";
license = licenses.mit;
maintainers = with maintainers; [ FlorianFranzen ];
};
}

View File

@ -0,0 +1,24 @@
{ lib
, buildPythonPackage
, fetchPypi
, python
}:
buildPythonPackage rec {
pname = "untokenize";
version = "0.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "3865dbbbb8efb4bb5eaa72f1be7f3e0be00ea8b7f125c69cbd1f5fda926f37a2";
};
checkPhase = "${python.interpreter} -m unittest discover";
meta = with lib; {
description = "Transforms tokens into original source code while preserving whitespace";
homepage = "https://github.com/myint/untokenize";
license = licenses.mit;
maintainers = with maintainers; [ FlorianFranzen ];
};
}

View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "jenkins";
version = "2.277.2";
version = "2.277.3";
src = fetchurl {
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
sha256 = "08lv5v5kxp9ln798gjmh8j9a8r8xc471fbhiz2l7gxncpxn50ga2";
sha256 = "1awixb55bkpqcvf2s59aph3kxdd70g9x1a5s5kly33kwrplcf8iy";
};
buildCommand = ''

View File

@ -187,7 +187,7 @@
"doorbird" = ps: with ps; [ aiohttp-cors ]; # missing inputs: doorbirdpy
"dovado" = ps: with ps; [ ]; # missing inputs: dovado
"downloader" = ps: with ps; [ ];
"dsmr" = ps: with ps; [ ]; # missing inputs: dsmr_parser
"dsmr" = ps: with ps; [ dsmr-parser ];
"dsmr_reader" = ps: with ps; [ aiohttp-cors paho-mqtt ];
"dte_energy_bridge" = ps: with ps; [ ];
"dublin_bus_transport" = ps: with ps; [ ];
@ -373,7 +373,7 @@
"hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi
"hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti
"hydrawise" = ps: with ps; [ hydrawiser ];
"hyperion" = ps: with ps; [ ]; # missing inputs: hyperion-py
"hyperion" = ps: with ps; [ hyperion-py ];
"iammeter" = ps: with ps; [ ]; # missing inputs: iammeter
"iaqualink" = ps: with ps; [ iaqualink ];
"icloud" = ps: with ps; [ pyicloud ];

View File

@ -236,6 +236,7 @@ in with py.pkgs; buildPythonApplication rec {
"devolo_home_control"
"dhcp"
"discovery"
"dsmr"
"econet"
"emulated_hue"
"esphome"
@ -269,6 +270,7 @@ in with py.pkgs; buildPythonApplication rec {
"html5"
"http"
"hue"
"hyperion"
"iaqualink"
"ifttt"
"image"

View File

@ -3,21 +3,23 @@
, fetchFromGitHub
, nixFlakes
, nix-prefetch
, nixpkgs-fmt
, nixpkgs-review
}:
buildPythonApplication rec {
pname = "nix-update";
version = "0.3.2";
version = "0.4.0";
src = fetchFromGitHub {
owner = "Mic92";
repo = pname;
rev = version;
sha256 = "1ykxr0yah7zl06igm7wiji9zx3y0xpjc37hbfhn6gnir6ssa0kqp";
sha256 = "sha256-n3YuNypKFaBtO5Fhf7Z3Wgh0+WH5bQWR0W0uHCYKtuY=";
};
makeWrapperArgs = [
"--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes nix-prefetch ])
"--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes nix-prefetch nixpkgs-fmt nixpkgs-review ])
];
checkPhase = ''

View File

@ -7,19 +7,21 @@
python3.pkgs.buildPythonApplication rec {
pname = "nixpkgs-review";
version = "2.5.0";
version = "2.6.0";
src = fetchFromGitHub {
owner = "Mic92";
repo = "nixpkgs-review";
rev = version;
sha256 = "1k4i54j5if86qf9dmwm8ybfc4j7ap40y82f03hxfxb7lzq5cqmcv";
sha256 = "sha256-096oSvc9DidURGKE0FNEBOQz82+RGg6aJo8o9HhaSp0=";
};
makeWrapperArgs = [
"--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes git ])
];
doCheck = false;
meta = with lib; {
description = "Review pull-requests on https://github.com/NixOS/nixpkgs";
homepage = "https://github.com/Mic92/nixpkgs-review";

View File

@ -6,20 +6,20 @@
let
pname = "cryptomator";
version = "1.5.14";
version = "1.5.15";
src = fetchFromGitHub {
owner = "cryptomator";
repo = "cryptomator";
rev = version;
sha256 = "05zgan1i2dzipzw8x510lg2l40dz9hvk43nrwpi0kg9l1qs9sxrq";
sha256 = "06n7wda7gfalvsg1rlcm51ss73nlbhh95z6zq18yvn040clkzkij";
};
icons = fetchFromGitHub {
owner = "cryptomator";
repo = "cryptomator-linux";
rev = version;
sha256 = "0gb5sd5bkpxv4hff1i09rxr90pi5d15vjsfrk9m8221xiypqmccp";
sha256 = "1sqbx858zglv0xkpjya0cpbkxf2hkj1xvxhnir3176y2xyjv6aib";
};
# perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB)
@ -44,7 +44,7 @@ let
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "0gvpjc77g99vcwk77nknvg8z33xbskcfwx3015nhhc089b2frq02";
outputHash = "195ysv9l861y9d1lvmvi7wmk172ynlba9n233blpaigq88cjn208";
};
in stdenv.mkDerivation rec {

View File

@ -0,0 +1,28 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule {
pname = "honeytrap";
version = "unstable-2020-12-10";
src = fetchFromGitHub {
owner = "honeytrap";
repo = "honeytrap";
rev = "affd7b21a5aa1b57f086e6871753cb98ce088d76";
sha256 = "y1SWlBFgX3bFoSRGJ45DdC1DoIK5BfO9Vpi2h57wWtU=";
};
# Otherwise, will try to install a "scripts" binary; it's only used in
# dockerize.sh, which we don't care about.
subPackages = [ "." ];
vendorSha256 = "W8w66weYzCpZ+hmFyK2F6wdFz6aAZ9UxMhccNy1X1R8=";
meta = with lib; {
description = "Advanced Honeypot framework";
homepage = "https://github.com/honeytrap/honeytrap";
license = licenses.asl20;
maintainers = teams.determinatesystems.members;
};
}

View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, alsaLib, atk, cairo, cups, udev
{ stdenv, lib, fetchurl, alsaLib, atk, cairo, cups, udev, libdrm, mesa
, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libappindicator-gtk3
, libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook
, runtimeShell, gsettings-desktop-schemas }:
@ -53,6 +53,8 @@ stdenv.mkDerivation rec {
xorg.libXrender
xorg.libXtst
xorg.libxcb
libdrm
mesa.out
];
runtimeDependencies = [

View File

@ -1744,6 +1744,8 @@ in
bindfs = callPackage ../tools/filesystems/bindfs { };
binwalk = with python3Packages; toPythonApplication binwalk;
birdtray = libsForQt5.callPackage ../applications/misc/birdtray { };
bitbucket-cli = python2Packages.bitbucket-cli;
@ -3456,6 +3458,8 @@ in
unifdef = callPackage ../development/tools/misc/unifdef { };
unify = with python3Packages; toPythonApplication unify;
unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { };
usb-modeswitch = callPackage ../development/tools/misc/usb-modeswitch { };
@ -29099,6 +29103,8 @@ in
hologram = callPackage ../tools/security/hologram { };
honeytrap = callPackage ../tools/security/honeytrap { };
tini = callPackage ../applications/virtualization/tini {};
ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { };

View File

@ -2032,6 +2032,8 @@ in {
ds4drv = callPackage ../development/python-modules/ds4drv { };
dsmr-parser = callPackage ../development/python-modules/dsmr-parser { };
duckdb = callPackage ../development/python-modules/duckdb {
inherit (pkgs) duckdb;
};
@ -3085,6 +3087,8 @@ in {
hyperframe = callPackage ../development/python-modules/hyperframe { };
hyperion-py = callPackage ../development/python-modules/hyperion-py { };
hyperkitty = callPackage ../servers/mail/mailman/hyperkitty.nix { };
hyperlink = callPackage ../development/python-modules/hyperlink { };
@ -7711,6 +7715,8 @@ in {
tahoma-api = callPackage ../development/python-modules/tahoma-api { };
tailer = callPackage ../development/python-modules/tailer { };
tasklib = callPackage ../development/python-modules/tasklib { };
taskw = callPackage ../development/python-modules/taskw { };
@ -8130,6 +8136,8 @@ in {
unifi = callPackage ../development/python-modules/unifi { };
unify = callPackage ../development/python-modules/unify { };
unifiled = callPackage ../development/python-modules/unifiled { };
units = callPackage ../development/python-modules/units { };
@ -8148,6 +8156,8 @@ in {
untangle = callPackage ../development/python-modules/untangle { };
untokenize = callPackage ../development/python-modules/untokenize { };
upass = callPackage ../development/python-modules/upass { };
update_checker = callPackage ../development/python-modules/update_checker { };