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] 2022-03-12 18:00:58 +00:00 committed by GitHub
commit 295cda2612
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 72 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/networking/amuled.nix
View File

@ -76,7 +76,7 @@ in
script = ''
${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${user} \
-c 'HOME="${cfg.dataDir}" ${pkgs.amuleDaemon}/bin/amuled'
-c 'HOME="${cfg.dataDir}" ${pkgs.amule-daemon}/bin/amuled'
'';
};
};

4
pkgs/applications/audio/easyeffects/default.nix
View File

@ -35,13 +35,13 @@
stdenv.mkDerivation rec {
pname = "easyeffects";
version = "6.2.3";
version = "6.2.4";
src = fetchFromGitHub {
owner = "wwmm";
repo = "easyeffects";
rev = "v${version}";
sha256 = "sha256-A1UanrAbmZFGCmDNIr1h+v5RVMsIl4qgM/veBirudQM=";
sha256 = "sha256-g/qN1Tafh71HdPLHW43Zva9MK6G+qxSnb1aRisuwdBw=";
};
nativeBuildInputs = [

8
pkgs/applications/misc/crow-translate/default.nix
View File

@ -34,8 +34,8 @@ let
qonlinetranslator = fetchFromGitHub {
owner = "crow-translate";
repo = "QOnlineTranslator";
rev = "1.5.2";
sha256 = "sha256-iGi25aKwff2hNNx6o4kHZV8gVbEQcMgpTTvop3CoLjM=";
rev = "1.5.3";
sha256 = "sha256-L8y4vazbWD5SC7itxQOjEcX10w0laewxTOGz+Yd+kVM=";
};
circleflags = fetchFromGitHub {
owner = "HatScripts";
@ -52,13 +52,13 @@ let
in
mkDerivation rec {
pname = "crow-translate";
version = "2.9.1";
version = "2.9.2";
src = fetchFromGitHub {
owner = "crow-translate";
repo = pname;
rev = version;
sha256 = "sha256-7Zb6PZO8eLeGPEZD37ja+LZydIQdsgy5gMAMtlS4k5Y=";
sha256 = "sha256-cxfBdoqGVmtCaXyw6QzXj2V44wKyVal/uqsddwIdvjw=";
};
patches = [

2
pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch
View File

@ -46,7 +46,7 @@ index c92e745..f265f03 100644
FetchContent_Declare(QOnlineTranslator
- GIT_REPOSITORY https://github.com/crow-translate/QOnlineTranslator
- GIT_TAG 1.5.2
- GIT_TAG 1.5.3
+ SOURCE_DIR @qonlinetranslator@
)

2
pkgs/applications/networking/cluster/k3s/update.sh
View File

@ -7,7 +7,7 @@ WORKDIR=$(mktemp -d)
trap "rm -rf ${WORKDIR}" EXIT
NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"/
NIXPKGS_K3S_FOLDER=${NIXPKGS_ROOT}$(dirname "${BASH_SOURCE[0]}")/
NIXPKGS_K3S_FOLDER=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/
cd ${NIXPKGS_K3S_FOLDER}
LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json

4
pkgs/applications/networking/p2p/gnunet/default.nix
View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "gnunet";
version = "0.15.3";
version = "0.16.0";
src = fetchurl {
url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";
sha256 = "sha256-1iZpqPQeB46qIgznejL08/gB4wmTV66McFSY/nOITsU=";
sha256 = "sha256-0y2m8T/xzYZwUlcZ6g956fdtLef2Bphg4Kd/xpo2AGg=";
};
enableParallelBuilding = true;

8
pkgs/applications/networking/remote/remmina/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook
, glib, gtk3, gettext, libxkbfile, libX11
, freerdp, libssh, libgcrypt, gnutls
, freerdp, libssh, libgcrypt, gnutls, vte
, pcre2, libdbusmenu-gtk3, libappindicator-gtk3
, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
, libsecret, libsoup, spice-protocol, spice-gtk, libepoxy, at-spi2-core
@ -8,6 +8,7 @@
# The themes here are soft dependencies; only icons are missing without them.
, gnome
, withLibsecret ? true
, withVte ? true
}:
with lib;
@ -33,10 +34,11 @@ stdenv.mkDerivation rec {
libsoup spice-protocol spice-gtk libepoxy at-spi2-core
openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk
harfbuzz
] ++ optionals withLibsecret [ libsecret ];
] ++ optionals withLibsecret [ libsecret ]
++ optionals withVte [ vte ];
cmakeFlags = [
"-DWITH_VTE=OFF"
"-DWITH_VTE=${if withVte then "ON" else "OFF"}"
"-DWITH_TELEPATHY=OFF"
"-DWITH_AVAHI=OFF"
"-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}"

4
pkgs/applications/terminal-emulators/roxterm/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "roxterm";
version = "3.11.1";
version = "3.12.1";
src = fetchFromGitHub {
owner = "realh";
repo = "roxterm";
rev = version;
sha256 = "1n7588bl83sp51jwjq97f526c7fkh0kq90idw3nayb4zmi530irx";
sha256 = "sha256-jVcf/nrEq8dM8rw40ZhXGJjt3DQLroCePtIAdAsVIfs=";
};
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook libxslt ];

22
pkgs/data/fonts/noto-fonts/default.nix
View File

@ -5,12 +5,12 @@
, fetchurl
, cairo
, nixosTests
, python3
, pkg-config
, pngquant
, which
, imagemagick
, zopfli
, buildPackages
}:
let
@ -130,8 +130,8 @@ in
noto-fonts-emoji = let
version = "2.034";
emojiPythonEnv =
python3.withPackages (p: with p; [ fonttools nototools ]);
in stdenv.mkDerivation {
buildPackages.python3.withPackages (p: with p; [ fonttools nototools ]);
in stdenvNoCC.mkDerivation {
pname = "noto-fonts-emoji";
inherit version;
@ -142,13 +142,17 @@ in
sha256 = "1d6zzk0ii43iqfnjbldwp8sasyx99lbjp1nfgqjla7ixld6yp98l";
};
nativeBuildInputs = [
depsBuildBuild = [
buildPackages.stdenv.cc
pkg-config
cairo
];
nativeBuildInputs = [
imagemagick
zopfli
pngquant
which
pkg-config
emojiPythonEnv
];
@ -159,14 +163,6 @@ in
# python requirements using python.withPackages
sed -i '/ifndef VIRTUAL_ENV/,+2d' Makefile
# Remove check for missing zopfli, it doesn't
# work and we guarantee its presence already.
sed -i '/ifdef MISSING_ZOPFLI/,+2d' Makefile
sed -i '/ifeq (,$(shell which $(ZOPFLIPNG)))/,+4d' Makefile
sed -i '/ZOPFLIPNG = zopflipng/d' Makefile
echo "ZOPFLIPNG = ${zopfli}/bin/zopflipng" >> Makefile
# Make the build verbose so it won't get culled by Hydra thinking that
# it somehow got stuck doing nothing.
sed -i 's;\t@;\t;' Makefile

4
pkgs/data/themes/flat-remix-gtk/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "flat-remix-gtk";
version = "20220215";
version = "20220310";
src = fetchFromGitHub {
owner = "daniruiz";
repo = pname;
rev = version;
sha256 = "sha256-J9PAHQ/MbdDuX16ioQQnzZpIZs/NJVkJjLL4nfaeNkU=";
sha256 = "sha256-fKkqMGb1UopjM7hTTury1I3oD5AlHqKP+WLmgAZIQxo=";
};
dontBuild = true;

6
pkgs/desktops/gnome/apps/gnome-todo/default.nix
View File

@ -27,14 +27,14 @@
stdenv.mkDerivation rec {
pname = "gnome-todo";
version = "unstable-2022-02-01";
version = "unstable-2022-03-11";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "gnome-todo";
rev = "2cd071ad35efdef72038730d658f013dd0fc7daa";
sha256 = "FMG9ju+LsglAvbBhdgDF+2ZxB633EwnatwCFgW+VOTk=";
rev = "07791399742366b4e3a6897430054d91df4594b4";
sha256 = "821KgxkkW4T6bdGuttAz9ao/WStM1QEfn4hY/b0d0jI=";
};
patches = [

6
pkgs/development/libraries/gtk-frdp/default.nix
View File

@ -14,14 +14,14 @@
stdenv.mkDerivation rec {
pname = "gtk-frdp";
version = "unstable-2021-10-01";
version = "unstable-2021-10-28";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
rev = "9c15c1202ed66fe20334e33d798cc5ebd39917f0";
sha256 = "2YOLpyd26qWQKvneH4ww2DS8h/ZNYDmfbYIjQDvDMko=";
rev = "a44d84ec687f41ad37e43697b28a018f65780780";
sha256 = "7J4jf3gDiorsc4zs6zwC+j/Zg0oZWKAFAz9vvJJ2CYM=";
};
nativeBuildInputs = [

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

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "persistent";
version = "4.8.0";
version = "4.9.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-nRd+rT+jwfXWKjbUUmdUs3bgUEx9S3XLmqUvt3HexrI=";
hash = "sha256-RwGzHYHBBCJlclrzkEUOnZFq10ucF4twEAU4U1keDGo=";
};
nativeBuildInputs = [

12
pkgs/development/python-modules/pymediaroom/default.nix
View File

@ -1,21 +1,19 @@
{ lib
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, fetchPypi
, pythonOlder
, xmltodict
}:
buildPythonPackage rec {
pname = "pymediaroom";
version = "0.6.4.1";
version = "0.6.5.4";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "dgomes";
repo = pname;
rev = version;
sha256 = "1klf2dxd8rlq3n4b9m03lzwcsasn9vi6m3hzrjqhqnprhrnp0xmy";
src = fetchPypi {
inherit pname version;
hash = "sha256-CZh2knpLT7xt5s6+kTQ4Mq9LcpKgWvgdFCkPtMucJTM=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/zwave-js-server-python/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "zwave-js-server-python";
version = "0.35.1";
version = "0.35.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = version;
sha256 = "sha256-WmpXQttcQ3Z/SFkNPfmvPWPGzWectQBoI9+bL2QYeaY=";
sha256 = "sha256-Bte4pAi+atdkMvxYlzdN/UOrHB2WKfl44U9m/vKFMoA=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/delve/default.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "delve";
version = "1.8.1";
version = "1.8.2";
goPackagePath = "github.com/go-delve/delve";
excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)";
@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "go-delve";
repo = "delve";
rev = "v${version}";
sha256 = "sha256-GIwu3G8cy2xKqFzN/7d/mbpS+5oGJa3QexoELlEwWRA=";
sha256 = "sha256-rW3uKf5T+ZCjZxVuSFWWXw0mhAW9Y9L83xtU98JTuik=";
};
subPackages = [ "cmd/dlv" ];

27
pkgs/development/tools/misc/sipp/default.nix
View File

@ -1,29 +1,29 @@
{lib, stdenv, fetchurl, ncurses, libpcap }:
{ lib, stdenv, fetchurl, ncurses, libpcap, cmake, openssl, git, lksctp-tools }:
stdenv.mkDerivation rec {
version = "3.6.0";
version = "3.6.1";
pname = "sipp";
src = fetchurl {
url = "https://github.com/SIPp/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "1fx1iy2n0m2kr91n1ii30frbscq375k3lqihdgvrqxn0zq8pnzp4";
sha256 = "sha256-alYOg6/5gvMx3byt+zvVMMWJbNW3V91utoITPMhg7LE=";
};
postPatch = ''
sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp
cp version.h src/version.h
'';
configureFlags = [
"--with-pcap"
cmakeFlags = [
"-DUSE_GSL=1"
"-DUSE_PCAP=1"
"-DUSE_SSL=1"
"-DUSE_SCTP=${if stdenv.isLinux then "1" else "0"}"
];
enableParallelBuilding = true;
postInstall = ''
mkdir -pv $out/share/pcap
cp pcap/* $out/share/pcap
'';
buildInputs = [ncurses libpcap];
nativeBuildInputs = [ cmake git ];
buildInputs = [ ncurses libpcap openssl ]
++ lib.optional (stdenv.isLinux) lksctp-tools;
meta = with lib; {
homepage = "http://sipp.sf.net";
@ -32,4 +32,3 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
};
}

4
pkgs/development/web/grails/default.nix
View File

@ -11,11 +11,11 @@ let
in
stdenv.mkDerivation rec {
pname = "grails";
version = "5.1.2";
version = "5.1.3";
src = fetchurl {
url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
sha256 = "sha256-S8YDGShglCB8zMHBwLlvPwq9dIAgQq2Xb8G1Pf0dXiQ=";
sha256 = "sha256-BacAVAnS3qdmzHGVUdZI2hn4Arp9Qep6cAXRabpB10M=";
};
nativeBuildInputs = [ unzip ];

11
pkgs/os-specific/linux/zfs/default.nix
View File

@ -19,8 +19,9 @@
, linuxPackages_5_16 ? pkgs.linuxKernel.packages.linux_5_16
}:
with lib;
let
inherit (lib) any optionalString optionals optional makeBinPath;
smartmon = smartmontools.override { inherit enableMail; };
buildKernel = any (n: n == configFile) [ "kernel" "all" ];
@ -113,7 +114,7 @@ let
configureFlags = [
"--with-config=${configFile}"
"--with-tirpc=1"
(withFeatureAs (buildUser && enablePython) "python" python3.interpreter)
(lib.withFeatureAs (buildUser && enablePython) "python" python3.interpreter)
] ++ optionals buildUser [
"--with-dracutdir=$(out)/lib/dracut"
"--with-udevdir=$(out)/lib/udev"
@ -200,9 +201,9 @@ let
'';
homepage = "https://github.com/openzfs/zfs";
changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}";
license = licenses.cddl;
platforms = platforms.linux;
maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin ];
license = lib.licenses.cddl;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ hmenke jcumming jonringer wizeman fpletz globin ];
mainProgram = "zfs";
# If your Linux kernel version is not yet supported by zfs, try zfsUnstable.
# On NixOS set the option boot.zfs.enableUnstable.

4
pkgs/servers/computing/slurm/default.nix
View File

@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
pname = "slurm";
version = "21.08.5.1";
version = "21.08.6.1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases.
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
repo = "slurm";
# The release tags use - instead of .
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
sha256 = "sha256-2ctJnCZCziPnfWeDNvvcE0tPGVdhzjjhqMWJhWhitGo=";
sha256 = "1pdj2nxxky2g9j0y5h6f7fvpypbh0a4g76z90115yr770yf4g2hz";
};
outputs = [ "out" "dev" ];

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

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.3.3";
version = "2022.3.4";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];

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

@ -158,7 +158,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
hassVersion = "2022.3.3";
hassVersion = "2022.3.4";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -176,7 +176,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-qe9/VFcEBDfSa7AYrkmj1b6UGLHcm7CtLHiPwzZz8jg=";
hash = "sha256-7de1m7pvPkgCcZN/Slhy26Y1j2NtkebkGanSTl9jN1M=";
};
# leave this in, so users don't have to constantly update their downstream patch handling