295cda2 · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge master into staging-next

commit295cda2612d6b8a487f8fced27e7721e64443760 authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> dateSat 12 Mar 2022, 18:00 (5 years ago) parent80180c3 dcd3711

22 files changed+72−76

compare with master

unifiedsplit

nixos/modules/services/networking/amuled.nix+1−1

@@ -76,7 +76,7 @@ in

7676

7777 script = ''

7878 ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${user} \

79− -c 'HOME="${cfg.dataDir}" ${pkgs.amuleDaemon}/bin/amuled'

79+ -c 'HOME="${cfg.dataDir}" ${pkgs.amule-daemon}/bin/amuled'

8080 '';

8181 };

8282 };

pkgs/applications/audio/easyeffects/default.nix+2−2

@@ -35,13 +35,13 @@

3535

3636stdenv.mkDerivation rec {

3737 pname = "easyeffects";

38− version = "6.2.3";

38+ version = "6.2.4";

3939

4040 src = fetchFromGitHub {

4141 owner = "wwmm";

4242 repo = "easyeffects";

4343 rev = "v${version}";

44− sha256 = "sha256-A1UanrAbmZFGCmDNIr1h+v5RVMsIl4qgM/veBirudQM=";

44+ sha256 = "sha256-g/qN1Tafh71HdPLHW43Zva9MK6G+qxSnb1aRisuwdBw=";

4545 };

4646

4747 nativeBuildInputs = [

pkgs/applications/misc/crow-translate/default.nix+4−4

@@ -34,8 +34,8 @@ let

3434 qonlinetranslator = fetchFromGitHub {

3535 owner = "crow-translate";

3636 repo = "QOnlineTranslator";

37− rev = "1.5.2";

38− sha256 = "sha256-iGi25aKwff2hNNx6o4kHZV8gVbEQcMgpTTvop3CoLjM=";

37+ rev = "1.5.3";

38+ sha256 = "sha256-L8y4vazbWD5SC7itxQOjEcX10w0laewxTOGz+Yd+kVM=";

3939 };

4040 circleflags = fetchFromGitHub {

4141 owner = "HatScripts";

@@ -52,13 +52,13 @@ let

5252in

5353mkDerivation rec {

5454 pname = "crow-translate";

55− version = "2.9.1";

55+ version = "2.9.2";

5656

5757 src = fetchFromGitHub {

5858 owner = "crow-translate";

5959 repo = pname;

6060 rev = version;

61− sha256 = "sha256-7Zb6PZO8eLeGPEZD37ja+LZydIQdsgy5gMAMtlS4k5Y=";

61+ sha256 = "sha256-cxfBdoqGVmtCaXyw6QzXj2V44wKyVal/uqsddwIdvjw=";

6262 };

6363

6464 patches = [

pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch+1−1

@@ -46,7 +46,7 @@ index c92e745..f265f03 100644

4646

4747 FetchContent_Declare(QOnlineTranslator

4848- GIT_REPOSITORY https://github.com/crow-translate/QOnlineTranslator

49−- GIT_TAG 1.5.2

49+- GIT_TAG 1.5.3

5050+ SOURCE_DIR @qonlinetranslator@

5151 )

5252

pkgs/applications/networking/cluster/k3s/update.sh+1−1

@@ -7,7 +7,7 @@ WORKDIR=$(mktemp -d)

77trap "rm -rf ${WORKDIR}" EXIT

99NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"/

10−NIXPKGS_K3S_FOLDER=${NIXPKGS_ROOT}$(dirname "${BASH_SOURCE[0]}")/

10+NIXPKGS_K3S_FOLDER=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/

1111cd ${NIXPKGS_K3S_FOLDER}

1212

1313LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json

pkgs/applications/networking/p2p/gnunet/default.nix+2−2

@@ -7,11 +7,11 @@

88stdenv.mkDerivation rec {

99 pname = "gnunet";

10− version = "0.15.3";

10+ version = "0.16.0";

1111

1212 src = fetchurl {

1313 url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";

14− sha256 = "sha256-1iZpqPQeB46qIgznejL08/gB4wmTV66McFSY/nOITsU=";

14+ sha256 = "sha256-0y2m8T/xzYZwUlcZ6g956fdtLef2Bphg4Kd/xpo2AGg=";

1515 };

1616

1717 enableParallelBuilding = true;

pkgs/applications/networking/remote/remmina/default.nix+5−3

@@ -1,6 +1,6 @@

11{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook

22, glib, gtk3, gettext, libxkbfile, libX11

3−, freerdp, libssh, libgcrypt, gnutls

3+, freerdp, libssh, libgcrypt, gnutls, vte

44, pcre2, libdbusmenu-gtk3, libappindicator-gtk3

55, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon

66, libsecret, libsoup, spice-protocol, spice-gtk, libepoxy, at-spi2-core

@@ -8,6 +8,7 @@

88# The themes here are soft dependencies; only icons are missing without them.

99, gnome

1010, withLibsecret ? true

11+, withVte ? true

1112}:

1213

1314with lib;

@@ -33,10 +34,11 @@ stdenv.mkDerivation rec {

3334 libsoup spice-protocol spice-gtk libepoxy at-spi2-core

3435 openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk

3536 harfbuzz

36− ] ++ optionals withLibsecret [ libsecret ];

37+ ] ++ optionals withLibsecret [ libsecret ]

38+ ++ optionals withVte [ vte ];

3739

3840 cmakeFlags = [

39− "-DWITH_VTE=OFF"

41+ "-DWITH_VTE=${if withVte then "ON" else "OFF"}"

4042 "-DWITH_TELEPATHY=OFF"

4143 "-DWITH_AVAHI=OFF"

4244 "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}"

pkgs/applications/terminal-emulators/roxterm/default.nix+2−2

@@ -6,13 +6,13 @@

77stdenv.mkDerivation rec {

88 pname = "roxterm";

9− version = "3.11.1";

9+ version = "3.12.1";

1010

1111 src = fetchFromGitHub {

1212 owner = "realh";

1313 repo = "roxterm";

1414 rev = version;

15− sha256 = "1n7588bl83sp51jwjq97f526c7fkh0kq90idw3nayb4zmi530irx";

15+ sha256 = "sha256-jVcf/nrEq8dM8rw40ZhXGJjt3DQLroCePtIAdAsVIfs=";

1616 };

1717

1818 nativeBuildInputs = [ cmake pkg-config wrapGAppsHook libxslt ];

pkgs/data/fonts/noto-fonts/default.nix+9−13

@@ -5,12 +5,12 @@

55, fetchurl

66, cairo

77, nixosTests

8−, python3

98, pkg-config

109, pngquant

1110, which

1211, imagemagick

1312, zopfli

13+, buildPackages

1414}:

1515

1616let

@@ -130,8 +130,8 @@ in

130130 noto-fonts-emoji = let

131131 version = "2.034";

132132 emojiPythonEnv =

133− python3.withPackages (p: with p; [ fonttools nototools ]);

134− in stdenv.mkDerivation {

133+ buildPackages.python3.withPackages (p: with p; [ fonttools nototools ]);

134+ in stdenvNoCC.mkDerivation {

135135 pname = "noto-fonts-emoji";

136136 inherit version;

137137

@@ -142,13 +142,17 @@ in

142142 sha256 = "1d6zzk0ii43iqfnjbldwp8sasyx99lbjp1nfgqjla7ixld6yp98l";

143143 };

144144

145− nativeBuildInputs = [

145+ depsBuildBuild = [

146+ buildPackages.stdenv.cc

147+ pkg-config

146148 cairo

149+ ];

150+

151+ nativeBuildInputs = [

147152 imagemagick

148153 zopfli

149154 pngquant

150155 which

151− pkg-config

152156 emojiPythonEnv

153157 ];

154158

@@ -159,14 +163,6 @@ in

159163 # python requirements using python.withPackages

160164 sed -i '/ifndef VIRTUAL_ENV/,+2d' Makefile

161165

162− # Remove check for missing zopfli, it doesn't

163− # work and we guarantee its presence already.

164− sed -i '/ifdef MISSING_ZOPFLI/,+2d' Makefile

165− sed -i '/ifeq (,$(shell which $(ZOPFLIPNG)))/,+4d' Makefile

166−

167− sed -i '/ZOPFLIPNG = zopflipng/d' Makefile

168− echo "ZOPFLIPNG = ${zopfli}/bin/zopflipng" >> Makefile

169−

170166 # Make the build verbose so it won't get culled by Hydra thinking that

171167 # it somehow got stuck doing nothing.

172168 sed -i 's;\t@;\t;' Makefile

pkgs/data/themes/flat-remix-gtk/default.nix+2−2

@@ -6,13 +6,13 @@

77stdenv.mkDerivation rec {

88 pname = "flat-remix-gtk";

9− version = "20220215";

9+ version = "20220310";

1010

1111 src = fetchFromGitHub {

1212 owner = "daniruiz";

1313 repo = pname;

1414 rev = version;

15− sha256 = "sha256-J9PAHQ/MbdDuX16ioQQnzZpIZs/NJVkJjLL4nfaeNkU=";

15+ sha256 = "sha256-fKkqMGb1UopjM7hTTury1I3oD5AlHqKP+WLmgAZIQxo=";

1616 };

1717

1818 dontBuild = true;

pkgs/desktops/gnome/apps/gnome-todo/default.nix+3−3

@@ -27,14 +27,14 @@

2727

2828stdenv.mkDerivation rec {

2929 pname = "gnome-todo";

30− version = "unstable-2022-02-01";

30+ version = "unstable-2022-03-11";

3131

3232 src = fetchFromGitLab {

3333 domain = "gitlab.gnome.org";

3434 owner = "GNOME";

3535 repo = "gnome-todo";

36− rev = "2cd071ad35efdef72038730d658f013dd0fc7daa";

37− sha256 = "FMG9ju+LsglAvbBhdgDF+2ZxB633EwnatwCFgW+VOTk=";

36+ rev = "07791399742366b4e3a6897430054d91df4594b4";

37+ sha256 = "821KgxkkW4T6bdGuttAz9ao/WStM1QEfn4hY/b0d0jI=";

3838 };

3939

4040 patches = [

pkgs/development/libraries/gtk-frdp/default.nix+3−3

@@ -14,14 +14,14 @@

1414

1515stdenv.mkDerivation rec {

1616 pname = "gtk-frdp";

17− version = "unstable-2021-10-01";

17+ version = "unstable-2021-10-28";

1818

1919 src = fetchFromGitLab {

2020 domain = "gitlab.gnome.org";

2121 owner = "GNOME";

2222 repo = pname;

23− rev = "9c15c1202ed66fe20334e33d798cc5ebd39917f0";

24− sha256 = "2YOLpyd26qWQKvneH4ww2DS8h/ZNYDmfbYIjQDvDMko=";

23+ rev = "a44d84ec687f41ad37e43697b28a018f65780780";

24+ sha256 = "7J4jf3gDiorsc4zs6zwC+j/Zg0oZWKAFAz9vvJJ2CYM=";

2525 };

2626

2727 nativeBuildInputs = [

pkgs/development/python-modules/persistent/default.nix+2−2

@@ -10,14 +10,14 @@

1010

1111buildPythonPackage rec {

1212 pname = "persistent";

13− version = "4.8.0";

13+ version = "4.9.0";

1414 format = "setuptools";

1515

1616 disabled = pythonOlder "3.7";

1717

1818 src = fetchPypi {

1919 inherit pname version;

20− hash = "sha256-nRd+rT+jwfXWKjbUUmdUs3bgUEx9S3XLmqUvt3HexrI=";

20+ hash = "sha256-RwGzHYHBBCJlclrzkEUOnZFq10ucF4twEAU4U1keDGo=";

2121 };

2222

2323 nativeBuildInputs = [

pkgs/development/python-modules/pymediaroom/default.nix+5−7

@@ -1,21 +1,19 @@

11{ lib

22, async-timeout

33, buildPythonPackage

4−, fetchFromGitHub

4+, fetchPypi

55, pythonOlder

66, xmltodict

77}:

99buildPythonPackage rec {

1010 pname = "pymediaroom";

11− version = "0.6.4.1";

11+ version = "0.6.5.4";

1212 disabled = pythonOlder "3.5";

1313

14− src = fetchFromGitHub {

15− owner = "dgomes";

16− repo = pname;

17− rev = version;

18− sha256 = "1klf2dxd8rlq3n4b9m03lzwcsasn9vi6m3hzrjqhqnprhrnp0xmy";

14+ src = fetchPypi {

15+ inherit pname version;

16+ hash = "sha256-CZh2knpLT7xt5s6+kTQ4Mq9LcpKgWvgdFCkPtMucJTM=";

1917 };

2018

2119 propagatedBuildInputs = [

pkgs/development/python-modules/zwave-js-server-python/default.nix+2−2

@@ -10,7 +10,7 @@

1010

1111buildPythonPackage rec {

1212 pname = "zwave-js-server-python";

13− version = "0.35.1";

13+ version = "0.35.2";

1414 format = "setuptools";

1515

1616 disabled = pythonOlder "3.8";

@@ -19,7 +19,7 @@ buildPythonPackage rec {

1919 owner = "home-assistant-libs";

2020 repo = pname;

2121 rev = version;

22− sha256 = "sha256-WmpXQttcQ3Z/SFkNPfmvPWPGzWectQBoI9+bL2QYeaY=";

22+ sha256 = "sha256-Bte4pAi+atdkMvxYlzdN/UOrHB2WKfl44U9m/vKFMoA=";

2323 };

2424

2525 propagatedBuildInputs = [

pkgs/development/tools/delve/default.nix+2−2

@@ -2,7 +2,7 @@

33buildGoPackage rec {

44 pname = "delve";

5− version = "1.8.1";

5+ version = "1.8.2";

77 goPackagePath = "github.com/go-delve/delve";

88 excludedPackages = "\$_fixtures\\|scripts\\|service/test\$";

@@ -11,7 +11,7 @@ buildGoPackage rec {

1111 owner = "go-delve";

1212 repo = "delve";

1313 rev = "v${version}";

14− sha256 = "sha256-GIwu3G8cy2xKqFzN/7d/mbpS+5oGJa3QexoELlEwWRA=";

14+ sha256 = "sha256-rW3uKf5T+ZCjZxVuSFWWXw0mhAW9Y9L83xtU98JTuik=";

1515 };

1616

1717 subPackages = [ "cmd/dlv" ];

pkgs/development/tools/misc/sipp/default.nix+13−14

@@ -1,29 +1,29 @@

1−{lib, stdenv, fetchurl, ncurses, libpcap }:

1+{ lib, stdenv, fetchurl, ncurses, libpcap, cmake, openssl, git, lksctp-tools }:

33stdenv.mkDerivation rec {

4− version = "3.6.0";

5−

4+ version = "3.6.1";

65 pname = "sipp";

87 src = fetchurl {

98 url = "https://github.com/SIPp/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";

10− sha256 = "1fx1iy2n0m2kr91n1ii30frbscq375k3lqihdgvrqxn0zq8pnzp4";

9+ sha256 = "sha256-alYOg6/5gvMx3byt+zvVMMWJbNW3V91utoITPMhg7LE=";

1110 };

1211

1312 postPatch = ''

14− sed -i "s@pcap/$.*$.pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp

13+ cp version.h src/version.h

1514 '';

1615

17− configureFlags = [

18− "--with-pcap"

16+ cmakeFlags = [

17+ "-DUSE_GSL=1"

18+ "-DUSE_PCAP=1"

19+ "-DUSE_SSL=1"

20+ "-DUSE_SCTP=${if stdenv.isLinux then "1" else "0"}"

1921 ];

22+ enableParallelBuilding = true;

2023

21− postInstall = ''

22− mkdir -pv $out/share/pcap

23− cp pcap/* $out/share/pcap

24− '';

25−

26− buildInputs = [ncurses libpcap];

24+ nativeBuildInputs = [ cmake git ];

25+ buildInputs = [ ncurses libpcap openssl ]

26+ ++ lib.optional (stdenv.isLinux) lksctp-tools;

2727

2828 meta = with lib; {

2929 homepage = "http://sipp.sf.net";

@@ -32,4 +32,3 @@ stdenv.mkDerivation rec {

3232 platforms = platforms.unix;

3333 };

3434}

35−

pkgs/development/web/grails/default.nix+2−2

@@ -11,11 +11,11 @@ let

1111in

1212stdenv.mkDerivation rec {

1313 pname = "grails";

14− version = "5.1.2";

14+ version = "5.1.3";

1515

1616 src = fetchurl {

1717 url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";

18− sha256 = "sha256-S8YDGShglCB8zMHBwLlvPwq9dIAgQq2Xb8G1Pf0dXiQ=";

18+ sha256 = "sha256-BacAVAnS3qdmzHGVUdZI2hn4Arp9Qep6cAXRabpB10M=";

1919 };

2020

2121 nativeBuildInputs = [ unzip ];

pkgs/os-specific/linux/zfs/default.nix+6−5

@@ -19,8 +19,9 @@

1919, linuxPackages_5_16 ? pkgs.linuxKernel.packages.linux_5_16

2020}:

2121

22−with lib;

2322let

23+ inherit (lib) any optionalString optionals optional makeBinPath;

24+

2425 smartmon = smartmontools.override { inherit enableMail; };

2526

2627 buildKernel = any (n: n == configFile) [ "kernel" "all" ];

@@ -113,7 +114,7 @@ let

113114 configureFlags = [

114115 "--with-config=${configFile}"

115116 "--with-tirpc=1"

116− (withFeatureAs (buildUser && enablePython) "python" python3.interpreter)

117+ (lib.withFeatureAs (buildUser && enablePython) "python" python3.interpreter)

117118 ] ++ optionals buildUser [

118119 "--with-dracutdir=$(out)/lib/dracut"

119120 "--with-udevdir=$(out)/lib/udev"

@@ -200,9 +201,9 @@ let

200201 '';

201202 homepage = "https://github.com/openzfs/zfs";

202203 changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}";

203− license = licenses.cddl;

204− platforms = platforms.linux;

205− maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin ];

204+ license = lib.licenses.cddl;

205+ platforms = lib.platforms.linux;

206+ maintainers = with lib.maintainers; [ hmenke jcumming jonringer wizeman fpletz globin ];

206207 mainProgram = "zfs";

207208 # If your Linux kernel version is not yet supported by zfs, try zfsUnstable.

208209 # On NixOS set the option boot.zfs.enableUnstable.

pkgs/servers/computing/slurm/default.nix+2−2

@@ -9,7 +9,7 @@

1010stdenv.mkDerivation rec {

1111 pname = "slurm";

12− version = "21.08.5.1";

12+ version = "21.08.6.1";

1313

1414 # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php

1515 # because the latter does not keep older releases.

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

1818 repo = "slurm";

1919 # The release tags use - instead of .

2020 rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";

21− sha256 = "sha256-2ctJnCZCziPnfWeDNvvcE0tPGVdhzjjhqMWJhWhitGo=";

21+ sha256 = "1pdj2nxxky2g9j0y5h6f7fvpypbh0a4g76z90115yr770yf4g2hz";

2222 };

2323

2424 outputs = [ "out" "dev" ];

pkgs/servers/home-assistant/component-packages.nix+1−1

@@ -2,7 +2,7 @@

22# Do not edit!

44{

5− version = "2022.3.3";

5+ version = "2022.3.4";

66 components = {

77 "abode" = ps: with ps; [ abodepy ];

88 "accuweather" = ps: with ps; [ accuweather ];

pkgs/servers/home-assistant/default.nix+2−2

@@ -158,7 +158,7 @@ let

158158 extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);

159159

160160 # Don't forget to run parse-requirements.py after updating

161− hassVersion = "2022.3.3";

161+ hassVersion = "2022.3.4";

162162

163163in python.pkgs.buildPythonApplication rec {

164164 pname = "homeassistant";

@@ -176,7 +176,7 @@ in python.pkgs.buildPythonApplication rec {

176176 owner = "home-assistant";

177177 repo = "core";

178178 rev = version;

179− hash = "sha256-qe9/VFcEBDfSa7AYrkmj1b6UGLHcm7CtLHiPwzZz8jg=";

179+ hash = "sha256-7de1m7pvPkgCcZN/Slhy26Y1j2NtkebkGanSTl9jN1M=";

180180 };

181181

182182 # leave this in, so users don't have to constantly update their downstream patch handling