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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-01-26 18:27:13 +00:00 committed by GitHub
commit a3b529a460
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 62 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/contributing/contributing-to-documentation.xml
View File

@ -12,7 +12,7 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename> sub
<screen>
<prompt>$ </prompt>cd /path/to/nixpkgs/doc
<prompt>$ </prompt>nix-shell
<prompt>[nix-shell]$ </prompt>make
<prompt>[nix-shell]$ </prompt>make $makeFlags
</screen>
<para>
If you experience problems, run <command>make debug</command> to help understand the docbook errors.

4
pkgs/applications/networking/browsers/vivaldi/default.nix
View File

@ -18,11 +18,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "3.5.2115.73-1";
version = "3.5.2115.87-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
sha256 = "0gjar22b0qdirww4mlb0d0pm2cqkhlp1jn88gwxwvx6g72p3b6lz";
sha256 = "0m0w2sj6kdd2b67f3kfcf4qyyxhqnmi2qzjwmqpmns9a485s6bn0";
};
unpackPhase = ''

15
pkgs/applications/networking/cluster/terragrunt/default.nix
View File

@ -1,23 +1,26 @@
{ lib, buildGoModule, fetchFromGitHub, makeWrapper }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "terragrunt";
version = "0.27.1";
version = "0.27.3";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-YZ/3qtukPoCbgzy1qr0MJHSdqovzmP/AQixLq6GO27Q";
sha256 = "sha256-J1kwcguBSHTsU/kGviQaj/cX6PpZGs3UI2AJy5+/pCc=";
};
vendorSha256 = "sha256-AMxBzUHRsq1HOMtvgYqIw22Cky7gQ7/2hI8wQnxaXb0=";
doCheck = false;
buildInputs = [ makeWrapper ];
buildFlagsArray = [ "-ldflags=" "-X main.VERSION=v${version}" ];
buildFlagsArray = [
"-ldflags="
"-s"
"-w"
"-X main.VERSION=v${version}"
];
meta = with lib; {
description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices";

2
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View File

@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
"version": "1.7.17",
"version": "1.7.18",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {

4
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View File

@ -8,12 +8,12 @@
let
executableName = "element-desktop";
version = "1.7.17";
version = "1.7.18";
src = fetchFromGitHub {
owner = "vector-im";
repo = "element-desktop";
rev = "v${version}";
sha256 = "sha256-3GFfldQoD5plIeuAOd4OcB/q7m8tKU6so+M8MlB6Uuc=";
sha256 = "sha256-5k+VVcloFAcFvk683r7njOCuj7OOnHS9QLEHFu0g+5o=";
};
in mkYarnPackage rec {
name = "element-desktop-${version}";

4
pkgs/applications/networking/instant-messengers/element/element-web.nix
View File

@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "element-web";
version = "1.7.17";
version = "1.7.18";
src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
sha256 = "sha256-9DyA3h0sQCzOFZ9gEReJrMQOnygFvEB7PeIpkG/F5H4=";
sha256 = "sha256-fgbdlVTPPZriOoDsBbpmDWEEzHEunaDIl/sT4/6A9LM=";
};
installPhase = ''

1
pkgs/applications/science/biology/sortmerna/default.nix
View File

@ -41,5 +41,6 @@ stdenv.mkDerivation rec {
platforms = platforms.x86_64;
homepage = "https://bioinfo.lifl.fr/RNA/sortmerna/";
maintainers = with maintainers; [ luispedro ];
broken = stdenv.isDarwin;
};
}

10
pkgs/applications/video/mediathekview/default.nix
View File

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
version = "13.5.1";
version = "13.7.0";
pname = "mediathekview";
src = fetchurl {
url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz";
sha256 = "0fixr6drim0wmh4q44zikcla4mrnm44nm95d5naqsgx6idalddrc";
sha256 = "sha256-9SQUsxs/Zt7YaZo6FdeEF3MOUO3IbkDGwV5i72/X4bk=";
};
nativeBuildInputs = [ makeWrapper ];
@ -16,13 +16,13 @@ stdenv.mkDerivation rec {
install -m644 MediathekView.jar $out/lib
makeWrapper ${jre}/bin/java $out/bin/mediathek \
--add-flags "-Xmx1G -jar $out/lib/MediathekView.jar"
--add-flags "-Xmx1G --enable-preview -jar $out/lib/MediathekView.jar"
makeWrapper ${jre}/bin/java $out/bin/MediathekView \
--add-flags "-Xmx1G -jar $out/lib/MediathekView.jar"
--add-flags "-Xmx1G --enable-preview -jar $out/lib/MediathekView.jar"
makeWrapper ${jre}/bin/java $out/bin/MediathekView_ipv4 \
--add-flags "-Xmx1G -Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar"
--add-flags "-Xmx1G --enable-preview -Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar"
'';
meta = with lib; {

4
pkgs/data/icons/kora-icon-theme/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "kora-icon-theme";
version = "1.3.4";
version = "1.4.1";
src = fetchFromGitHub {
owner = "bikass";
repo = "kora";
rev = "v${version}";
sha256 = "01s7zhwwbdqgksjvfvn7kqijxzzc7734f707yk8y7anshq0518x3";
sha256 = "sha256-YGhusal8g/UXMqrQvj147OScg51uNABTMIXxVXvnpKY=";
};
nativeBuildInputs = [

9
pkgs/development/compilers/zz/default.nix
View File

@ -2,18 +2,19 @@
rustPlatform.buildRustPackage rec {
pname = "zz";
version = "0.1";
version = "unstable-2021-01-26";
# commit chosen by using the latest build from http://bin.zetz.it/
src = fetchFromGitHub {
owner = "aep";
repo = "zz";
rev = version;
sha256 = "0kqrfm2r9wn0p2c3lcprsy03p9qhrwjs990va8qi59jp704l84ad";
rev = "0b5c52674e9adf795fbfb051d4dceef3126e669f";
sha256 = "0bb77ll1g5i6a04ybpgx6lqsb74xs4v4nyqm9j4j6x24407h8l89";
};
nativeBuildInputs = [ makeWrapper ];
cargoSha256 = "0yllcqxyyhwr9h0z8q84l0ms8x6jrqhpg79ik4xng6h5yf4ab0pq";
cargoSha256 = "1lf4k3n89w2797c1yrj1dp97y8a8d5hnixr1nwa2qcq1sxmm5rcg";
postInstall = ''
wrapProgram $out/bin/zz --prefix PATH ":" "${lib.getBin z3}/bin"

13
pkgs/development/libraries/gensio/default.nix
View File

@ -1,6 +1,5 @@
{ autoreconfHook
, fetchFromGitHub
, fetchpatch
, lib
, nix-update-script
, pkg-config
@ -9,23 +8,15 @@
stdenv.mkDerivation rec {
pname = "gensio";
version = "2.2.1";
version = "2.2.3";
src = fetchFromGitHub {
owner = "cminyard";
repo = pname;
rev = "v${version}";
sha256 = "083khzvyvcgi9j99hbaswglivm9s6dly6spjvisvyacavaybgwgb";
sha256 = "sha256-jWKm64RvVkeA/Zvy8VIAXMykuqv2FEzsduN2zcPm4ME=";
};
patches = [
# Fix compilation without openipmi, can be dropped for the next release.
(fetchpatch {
url = "https://github.com/cminyard/gensio/commit/12f6203e6f7aa42172177d7b0870777b605af8d9.patch";
sha256 = "19dr4iacccc4il3asdxkag6cj2yc4bxd8p451syfxdm6289rwxic";
})
];
passthru = {
updateScript = nix-update-script {
attrPath = pname;

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

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "rocksdb";
version = "6.14.6";
version = "6.15.4";
src = fetchFromGitHub {
owner = "facebook";
repo = pname;
rev = "v${version}";
sha256 = "0cp0jgzwkwamykgnmsg0zvzakq58f1ihs7lslnn4nh4p9gm75rq5";
sha256 = "06lddr6md4ypmywvi6qrrkw97c8ddz0flj43hzx32ia3iq2mw4w5";
};
nativeBuildInputs = [ cmake ninja ];

5
pkgs/development/python-modules/shodan/default.nix
View File

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "shodan";
version = "1.24.0";
version = "1.25.0";
src = fetchPypi {
inherit pname version;
sha256 = "0b5ec40c954cd48c4e3234e81ad92afdc68438f82ad392fed35b7097eb77b6dd";
sha256 = "sha256-fivdvBtgv2IAQtABD0t2KoC0MRHb6pwEHXLUMl4mDCM=";
};
propagatedBuildInputs = [
@ -27,6 +27,7 @@ buildPythonPackage rec {
# The tests require a shodan api key, so skip them.
doCheck = false;
pythonImportsCheck = [ "shodan" ];
meta = with lib; {
description = "Python library and command-line utility for Shodan";

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

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "teslajsonpy";
version = "0.10.4";
version = "0.11.0";
src = fetchFromGitHub {
owner = "zabuldon";
repo = pname;
rev = "v${version}";
sha256 = "18frynmy47i9c24mdy819y2dnjwmhnmkly5mbmhikpbmm6d0yjf1";
sha256 = "sha256-yfaUa12doOvdFkbHHdOYcFcu86hYZtt2i0tya2ENjf4=";
};
propagatedBuildInputs = [
@ -27,7 +27,12 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook ];
# Not all Home Assistant related check pass
disabledTests = [ "test_values_on_init" ];
# https://github.com/zabuldon/teslajsonpy/issues/121
# https://github.com/zabuldon/teslajsonpy/pull/124
disabledTests = [
"test_values_on_init"
"test_get_value_on_init"
];
pythonImportsCheck = [ "teslajsonpy" ];
meta = with lib; {

2
pkgs/development/python-modules/transformers/default.nix
View File

@ -41,7 +41,7 @@ buildPythonPackage rec {
doCheck = false;
postPatch = ''
sed -ri 's/tokenizers==[0-9.]+/tokenizers/g' setup.py
sed -ri 's/tokenizers==[^"]+/tokenizers/g' setup.py src/transformers/dependency_versions_table.py
'';
pythonImportsCheck = [ "transformers" ];

4
pkgs/development/tools/analysis/rr/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }:
{ lib, gcc9Stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }:
stdenv.mkDerivation rec {
gcc9Stdenv.mkDerivation rec {
version = "5.4.0";
pname = "rr";

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

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "stagit";
version = "0.9.1";
version = "0.9.4";
src = fetchgit {
url = "git://git.codemadness.org/stagit";
rev = version;
sha256 = "0gh28spkry9wbmdj0hmvz3680fvbyzab9cifhj1p76f4fz27rnv9";
sha256 = "1n0f2pf4gmqnkx4kfn2c79zx2vk4xkg03h7wvdigijkkbhs7a3pm";
};
makeFlags = [ "PREFIX=$(out)" ];
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "git static site generator";
homepage = "https://git.codemadness.org/stagit/";
homepage = "https://git.codemadness.org/stagit/file/README.html";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ jb55 ];

16
pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix
View File

@ -2,26 +2,16 @@
buildGoModule rec {
pname = "prometheus-nextcloud-exporter";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "xperimental";
repo = "nextcloud-exporter";
rev = "v${version}";
sha256 = "1nmw1hkxgdp7nibrn1gz0lry0666rcc55s3kkfx64ykw6bnl0l34";
sha256 = "0kq0ka2gjlibl7vhk3s4z15ja5ai7cmwl144gj4dyhylp2xzr72a";
};
patches = [
# fixes failing test, remove with next update
# see https://github.com/xperimental/nextcloud-exporter/pull/25
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/xperimental/nextcloud-exporter/pull/25.patch";
sha256 = "03jvqlqbs5g6ijncx6vxkgwq646yrjlrm0lk2q5vhfjrgrkv0alv";
includes = [ "internal/config/config_test.go" ];
})
];
vendorSha256 = "0xdjphki0p03n6g5b4mm2x0rgm902rnbvq8r6p4r45k3mv8cggmf";
vendorSha256 = "0qs3p4jl8p0323bklrrhxzql7652pm6a1hj9ch9xyfhkwsx87l4d";
passthru.tests = { inherit (nixosTests.prometheus-exporters) nextcloud; };

4
pkgs/servers/ser2net/default.nix
View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "ser2net";
version = "4.3.0";
version = "4.3.2";
src = fetchFromGitHub {
owner = "cminyard";
repo = pname;
rev = "v${version}";
sha256 = "13zhds3zav03f1snc4bb1j07i2x606bmnqm17yx37frib2hjs4nx";
sha256 = "sha256-fA4rtFZ2lhGAwY3KUl/Jk8gjueI761J1QRdivMtbqX4=";
};
passthru = {

4
pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "waifu2x-converter-cpp";
version = "5.3.3";
version = "5.3.4";
src = fetchFromGitHub {
owner = "DeadSix27";
repo = pname;
rev = "v${version}";
sha256 = "04r0xyjknvcwk70ilj1p3qwlcz3i6sqgcp0qbc9qwxnsgrrgz09w";
sha256 = "0rv8bnyxz89za6gwk9gmdbaf3j7c1j52mip7h81rir288j35m84x";
};
patchPhase = ''

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

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "rauc";
version = "1.5";
version = "1.5.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "10v9nllfw5y53797p00hk6645zkaa6cacsim1rh6y2jngnqfkmw0";
sha256 = "sha256-AIizbD2jaZ5SY0K/hwpHdGE20KEhWC53LWUiVYs9Oiw=";
};
passthru = {

5
pkgs/tools/system/gdu/default.nix
View File

@ -1,5 +1,4 @@
{ lib
, buildGoModule
, fetchFromGitHub
, installShellFiles
@ -7,13 +6,13 @@
buildGoModule rec {
pname = "gdu";
version = "4.2.0";
version = "4.3.0";
src = fetchFromGitHub {
owner = "dundee";
repo = pname;
rev = "v${version}";
sha256 = "0ppsz7ys08lmg5s7lszqc2zcp2vjm54aai3yr3sb4jf3knbmyg5g";
sha256 = "0ilaywj5vz8lgvm63j2saakhmgb2134idn6l8msbif4lsawlr313";
};
vendorSha256 = "058h71gmgi3n4b697myi5890arzw8fkzmxlm1aiwzyfh3k9iv0wh";