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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-12-23 06:01:11 +00:00 committed by GitHub
commit c5a44bdf42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 400 additions and 593 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
View File

@ -46,11 +46,11 @@ in
serviceConfig = {
ExecStart = ''
${pkgs.prometheus-nginx-exporter}/bin/nginx-prometheus-exporter \
--nginx.scrape-uri '${cfg.scrapeUri}' \
--nginx.ssl-verify ${boolToString cfg.sslVerify} \
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
--web.telemetry-path ${cfg.telemetryPath} \
--prometheus.const-labels ${concatStringsSep "," cfg.constLabels} \
--nginx.scrape-uri='${cfg.scrapeUri}' \
--nginx.ssl-verify=${boolToString cfg.sslVerify} \
--web.listen-address=${cfg.listenAddress}:${toString cfg.port} \
--web.telemetry-path=${cfg.telemetryPath} \
--prometheus.const-labels=${concatStringsSep "," cfg.constLabels} \
${concatStringsSep " \\\n " cfg.extraFlags}
'';
};

4
pkgs/applications/graphics/hydrus/default.nix
View File

@ -10,14 +10,14 @@
python3Packages.buildPythonPackage rec {
pname = "hydrus";
version = "466";
version = "467";
format = "other";
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "v${version}";
sha256 = "sha256-ih2BctOC9cuTYP8A9ikhGBqNP0SToSAkqmZhtBvgpIo=";
sha256 = "sha256-ijIOCabpnaK9ww1cR+HNpCOn8uSwSEuyLWwnT2ypdD4=";
};
nativeBuildInputs = [

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "hugo";
version = "0.90.0";
version = "0.91.1";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-1qa7RHSkwQLMJr0l3JtdcHQsmSiKlRjF5ETSVhpo4jY=";
sha256 = "sha256-TPJGRXiZQ7yEttGFpVdiFcyUL5emfjfuoq3k+dQmKCg=";
};
vendorSha256 = "sha256-hRebd50RQ0JZGDf5zJX21UTjq5JwvPWWF/KA6/7JxVw=";
vendorSha256 = "sha256-ViWbqWjlHd8yosxe+CF1GJ9oK+plOn9s7ruhgsX/v58=";
doCheck = false;

4
pkgs/applications/misc/koreader/default.nix
View File

@ -13,12 +13,12 @@
let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; };
in stdenv.mkDerivation rec {
pname = "koreader";
version = "2021.11";
version = "2021.12";
src = fetchurl {
url =
"https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
sha256 = "sha256-5DNC0MlLB+2JBV2TADSvO40rPlvsPehfv+YE/45P2MA=";
sha256 = "sha256-duOIbYavqmUUkH6RthTYu/SeM8zOeeLm7CIAQwhw6AY=";
};
sourceRoot = ".";

4
pkgs/applications/misc/mkgmap/default.nix
View File

@ -14,11 +14,11 @@ let
in
stdenv.mkDerivation rec {
pname = "mkgmap";
version = "4827";
version = "4835";
src = fetchurl {
url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz";
sha256 = "2vK52NXE0LJq3nqFi08zliwRQwWFiQSsiAU412zjkQM=";
sha256 = "u4qwfL8qp+rUIIYuZmVYjEkh0riL8yeQz0t8j5shT34=";
};
patches = [

4
pkgs/applications/misc/weather/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, pythonPackages, installShellFiles }:
stdenv.mkDerivation rec {
version = "2.4.1";
version = "2.4.2";
pname = "weather";
src = fetchurl {
url = "http://fungi.yuggoth.org/weather/src/${pname}-${version}.tar.xz";
sha256 = "0nf680dl7a2vlgavdhj6ljq8a7lkhvr6zghkpzad53vmilxsndys";
sha256 = "sha256-qJl5rFDk31Fm+tmR6+Iiihcx6qyd9alHz2L672pNJsc=";
};
nativeBuildInputs = [

4
pkgs/applications/misc/xdg-launch/default.nix
View File

@ -12,7 +12,7 @@
}:
stdenv.mkDerivation rec {
pname = "xdg-launch";
version = "1.10";
version = "1.11";
postPatch = ''
# fix gettext configuration
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "bbidulock";
repo = pname;
rev = version;
sha256 = "sha256-WY1TAPnXAn5GOaP9aMHar761m1MkKm4vavLlWELWUu8=";
sha256 = "sha256-qrBxyJ3dUNdnE1nANLKKL0cXw/Hc4qxDoY1anIRN+VA=";
};
preConfigure = "./autogen.sh";

8
pkgs/applications/networking/cluster/helm/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helm";
version = "3.7.1";
gitCommit = "1d11fcb5d3f3bf00dbe6fe31b8412839a96b3dc4";
version = "3.7.2";
gitCommit = "663a896f4a815053445eec4153677ddc24a0a361";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
sha256 = "sha256-NjBG3yLtvnAXziLH/ALRJVaFW327qo7cvnf1Jpq3QlI=";
sha256 = "sha256-MhBuwpgF1PBAZ5QwF7t4J1gqam2cMX+hkdZs7KoSD6I=";
};
vendorSha256 = "sha256-gmyF/xuf5dTxorgqvW4PNA1l2SQ2oJuZCAFw7d8ufGc=";
vendorSha256 = "sha256-YDdpeVh9rG3MF1HgG7uuRvjXDr9Fcjuhrj16kpK8tsI=";
doCheck = false;

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

@ -4,11 +4,11 @@ let
in
stdenv.mkDerivation rec {
pname = "rocketchat-desktop";
version = "3.7.0";
version = "3.7.1";
src = fetchurl {
url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat_${version}_amd64.deb";
sha256 = "1z6crwb7svg7iw59gm88d29yknhk84hwcps9f565c3mabjdxzhw2";
sha256 = "1l4g0y7kb569w1i3c1bq6m0p9wykrf7k6a59j5cvnkl1b9h8mj4p";
};
nativeBuildInputs = [

4
pkgs/applications/networking/maestral-qt/default.nix
View File

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "maestral-qt";
version = "1.5.1";
version = "1.5.2";
disabled = python3.pkgs.pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral-qt";
rev = "v${version}";
sha256 = "sha256-LtKFdNX2/wSs9Hxplu7rz6rc1hoijCGgCKyLjlcRQoI=";
sha256 = "sha256-/wleUwTPkm5l8GgtBM2J0jsdc1A54WRYJPmHqSsdz4c=";
};
propagatedBuildInputs = with python3.pkgs; [

4
pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
View File

@ -3,12 +3,12 @@ electron, libsecret }:
stdenv.mkDerivation rec {
pname = "tutanota-desktop";
version = "3.89.23";
version = "3.89.25";
src = fetchurl {
url = "https://github.com/tutao/tutanota/releases/download/tutanota-release-${version}/${pname}-${version}-unpacked-linux.tar.gz";
name = "tutanota-desktop-${version}.tar.gz";
sha256 = "sha256-iYFcTttmt5rygC1uxX74BHvPmEDUVBdiPOh7FEQcmyE=";
sha256 = "sha256-0j0vL45kpZeBBdW7NY8lvseYUhXGPoCbOdUtT97fMiI=";
};
nativeBuildInputs = [

4
pkgs/applications/office/qownnotes/default.nix
View File

@ -5,13 +5,13 @@
mkDerivation rec {
pname = "qownnotes";
version = "21.12.3";
version = "21.12.4";
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Fetch the checksum of current version with curl:
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256
sha256 = "sha256-qS3zj5yI84Gvd4AMM5/mqoGWp6JgCBsKSPYfGuTCgCk=";
sha256 = "sha256-vvqcXu2P39VYbx45lavyJ2HIxPCJbzSpJo4gYd88Ub4=";
};
nativeBuildInputs = [ qmake qttools ];

4
pkgs/applications/version-management/github-desktop/default.nix
View File

@ -19,11 +19,11 @@
stdenv.mkDerivation rec {
pname = "github-desktop";
version = "2.9.4";
version = "2.9.6";
src = fetchurl {
url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux1/GitHubDesktop-linux-${version}-linux1.deb";
sha256 = "sha256-CcAOATIEcrUKhVQWFr0dMvY9Q5rHWQI9/KdSEZ/ncD4=";
sha256 = "sha256-YL3Gc76jWfQvY96pAlS5JB7BwSOUklNvGR0tOBdQHuE=";
};
nativeBuildInputs = [

6
pkgs/applications/version-management/gitkraken/default.nix
View File

@ -11,19 +11,19 @@ with lib;
let
curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; };
pname = "gitkraken";
version = "8.2.0";
version = "8.2.1";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
srcs = {
x86_64-linux = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
sha256 = "sha256-id8pdkTphi3J0ZG88K7oc/O6OwAvmWyFEs9kMbleSFs=";
sha256 = "sha256-FjG7htwMRLZmwH6OjjyHkGUTaVNzuMTn6BjXUnCgwAA=";
};
x86_64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
sha256 = "sha256-dwPKIXOQB3lixvMBJJRrRSamYRoC9n1rjcqi542dA44=";
sha256 = "sha256-cBZ53lekhPl5yjxclg2PeMCL0NKwshkKhP/lFbEinCs=";
};
aarch64-darwin = srcs.x86_64-darwin;

6
pkgs/development/compilers/swift/default.nix
View File

@ -340,7 +340,7 @@ stdenv.mkDerivation {
# TODO: consider using stress-tester and integration-test.
# Match the wrapped version of Swift to be installed.
export LIBRARY_PATH=${icu}/lib:${libgcc}/lib:${libuuid.out}/lib:$l
export LIBRARY_PATH=${lib.makeLibraryPath [icu libgcc libuuid]}:$l
checkTarget=check-swift-all-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}
ninjaFlags='-C buildbot_linux/swift-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}'
@ -363,13 +363,13 @@ stdenv.mkDerivation {
--set CC $out/bin/clang \
--suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \
--suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \
--suffix LIBRARY_PATH : ${icu}/lib:${libgcc}/lib:${libuuid.out}/lib
--suffix LIBRARY_PATH : ${lib.makeLibraryPath [icu libgcc libuuid]}
wrapProgram $out/bin/swiftc \
--set CC $out/bin/clang \
--suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \
--suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \
--suffix LIBRARY_PATH : ${icu}/lib:${libgcc}/lib:${libuuid.out}/lib
--suffix LIBRARY_PATH : ${lib.makeLibraryPath [icu libgcc libuuid]}
'';
# Hack to avoid build and install directories in RPATHs.

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

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "glfw";
version = "2.2.0";
version = "2.5.0";
src = fetchFromGitHub {
owner = "FlorianRhiem";
repo = "pyGLFW";
rev = "v${version}";
sha256 = "1ygcwnh0x07yi87wkxykw566g74vfi8n0w2rzypidhdss14x3pvf";
sha256 = "15kk0zhhja0yqah09wzpg6912zd5bjmk84ab1n5nwryicpg44hqk";
};
# Patch path to GLFW shared object

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

@ -1,21 +1,21 @@
{ buildPythonPackage, lib, libffi, isPy3k, pyasn1, clint, ndg-httpsclient
, protobuf, requests, args, gpapi, pyaxmlparser, setuptools, fetchFromGitHub
, protobuf, requests, args, matlink-gpapi, pyaxmlparser, setuptools, fetchFromGitHub
}:
buildPythonPackage rec {
pname = "gplaycli";
version = "3.26";
version = "3.29";
src = fetchFromGitHub {
owner = "matlink";
repo = "gplaycli";
rev = version;
sha256 = "188237d40q35dp5xs7hg4ybhvsyxi0bsqx5dk4ws9007n596in5f";
sha256 = "10gc1wr259z5hxyk834wyyggvyh82agfq0zp711s4jf334inp45r";
};
disabled = !isPy3k;
propagatedBuildInputs = [ libffi pyasn1 clint ndg-httpsclient protobuf requests args gpapi pyaxmlparser setuptools ];
propagatedBuildInputs = [ libffi pyasn1 clint ndg-httpsclient protobuf requests args matlink-gpapi pyaxmlparser setuptools ];
meta = with lib; {
homepage = "https://github.com/matlink/gplaycli";

35
pkgs/development/python-modules/matlink-gpapi/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ buildPythonPackage
, cryptography
, fetchPypi
, lib
, pythonOlder
, protobuf
, pycryptodome
, requests
}:
buildPythonPackage rec {
version = "0.4.4.5";
pname = "matlink-gpapi";
disabled = pythonOlder "3.3"; # uses shutil.which(), added in 3.3
src = fetchPypi {
inherit version pname;
sha256 = "0s45yb2xiq3pc1fh4bygfgly0fsjk5fkc4wckbckn3ddl7v7vz8c";
};
# package doesn't contain unit tests
# scripts in ./test require networking
doCheck = false;
pythonImportsCheck = [ "gpapi.googleplay" ];
propagatedBuildInputs = [ cryptography protobuf pycryptodome requests ];
meta = with lib; {
homepage = "https://github.com/NoMore201/googleplay-api";
license = licenses.gpl3Only;
description = "Google Play Unofficial Python API";
maintainers = with maintainers; [ schnusch ];
};
}

5
pkgs/development/python-modules/pre-commit-hooks/default.nix
View File

@ -5,6 +5,7 @@
, pythonOlder
, pytestCheckHook
, ruamel-yaml
, stdenv
, toml
}:
@ -30,6 +31,10 @@ buildPythonPackage rec {
pytestCheckHook
];
# Note: this is not likely to ever work on Darwin
# https://github.com/pre-commit/pre-commit-hooks/pull/655
doCheck = !stdenv.isDarwin;
# the tests require a functional git installation which requires a valid HOME
# directory.
preCheck = ''

4
pkgs/games/chiaki/default.nix
View File

@ -18,13 +18,13 @@
mkDerivation rec {
pname = "chiaki";
version = "2.1.0";
version = "2.1.1";
src = fetchgit {
url = "https://git.sr.ht/~thestr4ng3r/chiaki";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "1hgh2j71rch53cnpm3f195gpfgrb4hd0yqa810k3ikar8zl4h7sd";
sha256 = "sha256-VkCA8KS4EHuVSgoYt1YDT38hA1NEBckiBwRcgDZUSs4=";
};
nativeBuildInputs = [

4
pkgs/games/quakespasm/default.nix
View File

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "quakespasm";
version = "0.94.2";
version = "0.94.3";
src = fetchurl {
url = "mirror://sourceforge/quakespasm/quakespasm-${version}.tar.gz";
sha256 = "sha256-wIgtoJVZH14EKcVNqZdwV3a5jORptYkVMTW1UmvaHyo=";
sha256 = "sha256-PpX20+XHIF4aRosErKGnylXIqdMtG3Ubsi70zNG9Dq0=";
};
sourceRoot = "${pname}-${version}/Quake";

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

@ -3,8 +3,8 @@ let
src = fetchFromGitHub {
owner = "matrix-org";
repo = "matrix-appservice-slack";
rev = "1.9.0";
sha256 = "tx+dul+O7HZTGYW8ZSxoOZZmzm44nz0pYGQYp8xaVCw=";
rev = "1.10.0";
sha256 = "WnonduUhhrxCMuXOgLk8voNnn+f6R5CsJ7VKpEmGwzk=";
};
nodePackages = import ./node-composition.nix {

6
pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh
View File

@ -1,9 +1,9 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
# Download package.json and package-lock.json from the v1.9.0 release
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.9.0/package.json -o package.json
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.9.0/package-lock.json -o package-lock.json
# Download package.json and package-lock.json from the v1.10.0 release
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.10.0/package.json -o package.json
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.10.0/package-lock.json -o package-lock.json
node2nix \
--nodejs-12 \

841
pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

4
pkgs/tools/security/gitleaks/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "gitleaks";
version = "8.2.3";
version = "8.2.4";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
sha256 = "sha256-COYVgn7fhmU0ZUhlnqxQ/5rf5aVhkcWeG199DFcE/w4=";
sha256 = "sha256-74qNVW4NUGK16rZ3S7vxJ9Akci6ARcf4So1MydZVY3s=";
};
vendorSha256 = "sha256-cIwte59AdVOWMBUWE4gKZSHhU37HgEW4k0v+jUUyj1Q=";

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

@ -4794,6 +4794,8 @@ in {
mathlibtools = callPackage ../development/python-modules/mathlibtools { };
matlink-gpapi = callPackage ../development/python-modules/matlink-gpapi { };
matplotlib = callPackage ../development/python-modules/matplotlib {
stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;