cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-08-05 00:03:20 +00:00 committed by GitHub
commit 4885630746
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 52 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/system/boot/networkd.nix
View file

@ -1388,7 +1388,7 @@ let
dhcpServerStaticLeases = mkOption {
default = [];
example = [ { MACAddress = "65:43:4a:5b:d8:5f"; Address = "192.168.1.42"; } ];
example = [ { dhcpServerStaticLeaseConfig = { MACAddress = "65:43:4a:5b:d8:5f"; Address = "192.168.1.42"; }; } ];
type = with types; listOf (submodule dhcpServerStaticLeaseOptions);
description = ''
A list of DHCPServerStaticLease sections to be added to the unit. See
@ -1399,7 +1399,7 @@ let
ipv6Prefixes = mkOption {
default = [];
example = [ { AddressAutoconfiguration = true; OnLink = true; } ];
example = [ { ipv6PrefixConfig = { AddressAutoconfiguration = true; OnLink = true; }; } ];
type = with types; listOf (submodule ipv6PrefixOptions);
description = ''
A list of ipv6Prefix sections to be added to the unit. See

6
pkgs/applications/audio/termusic/default.nix
View file

@ -7,14 +7,14 @@
rustPlatform.buildRustPackage rec {
pname = "termusic";
version = "0.6.17";
version = "0.7.1";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-diZl+izb55EFQaL6soLVNrFhoi7AOFkFnVcAU2XlI+c=";
sha256 = "sha256-n5Z6LnZ0x+V46Exa9vSMrndZHperJlcXl1unfeTuo9M=";
};
cargoHash = "sha256-VW+tMnjuVnf/PsBAoMnOxbyNna1UpGB/5V52XSzBJr8=";
cargoHash = "sha256-eIM0/SWLZVyVsHyQ4GzKSjVTvK7oActAiBEv56+JqK4=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsa-lib ];

6
pkgs/applications/misc/gum/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gum";
version = "0.2.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = pname;
rev = "v${version}";
sha256 = "sha256-LP/vUfmUja3y7t6gT/YLt08mV+owp5cWolkiw8kfn78=";
sha256 = "sha256-zFw2Lf+N8jxrw6JYqzsDMXIMchFc2bxAofELrgIMquk=";
};
vendorSha256 = "sha256-uX0CQRqrM0/fj14owcUUpYph2j5ZwJITG53na31N6kg=";
vendorSha256 = "sha256-8MqBGMcYR/kbExfXBeQrO8p7a/uawUk2hLmnQtarWEw=";
nativeBuildInputs = [
installShellFiles

4
pkgs/applications/misc/qcad/default.nix
View file

@ -18,14 +18,14 @@
mkDerivation rec {
pname = "qcad";
version = "3.27.1.6";
version = "3.27.6.7";
src = fetchFromGitHub {
name = "qcad-${version}-src";
owner = "qcad";
repo = "qcad";
rev = "v${version}";
sha256 = "sha256-NnaCwbk8w0ZPnBz7xxs5LMFMUSnEERCSRBXpJL0u+s0=";
sha256 = "sha256-PGGm7XhjGngj2oD8NNh8aQOKRgcdx9qiQu/4ZYBceG8=";
};
patches = [

4
pkgs/applications/networking/browsers/palemoon/default.nix
View file

@ -45,7 +45,7 @@ assert with lib.strings; (
stdenv.mkDerivation rec {
pname = "palemoon";
version = "31.1.1";
version = "31.2.0.1";
src = fetchFromGitea {
domain = "repo.palemoon.org";
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
repo = "Pale-Moon";
rev = "${version}_Release";
fetchSubmodules = true;
sha256 = "sha256-lKD6+mXHWkNLc1XAX5mJGmwgz60P8mH+zrOi2WoOyJU=";
sha256 = "sha256-ytJC3QW9grbI6DusYITACc40+xUJ94+ATVGaOzWAwHU=";
};
nativeBuildInputs = [

11
pkgs/applications/networking/cluster/terraform-providers/default.nix
View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, buildGoModule
, buildGo117Module
, fetchFromGitHub
, callPackage
, config
@ -61,16 +60,6 @@ let
{
# mkisofs needed to create ISOs holding cloud-init data and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; });
# fails to build on x86_64-darwin with 1.18
lxd = automated-providers.lxd.override { mkProviderGoModule = buildGo117Module; };
# fails to build on x86_64-darwin with 1.18
netlify = automated-providers.netlify.override { mkProviderGoModule = buildGo117Module; };
# fails to build on x86_64-darwin with 1.18
pass = automated-providers.pass.override { mkProviderGoModule = buildGo117Module; };
# fails to build on x86_64-darwin with 1.18
skytap = automated-providers.skytap.override { mkProviderGoModule = buildGo117Module; };
# fails to build on x86_64-{darwin,linux} with 1.18
tencentcloud = automated-providers.tencentcloud.override { mkProviderGoModule = buildGo117Module; };
};
# Put all the providers we not longer support in this list.

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

@ -5,13 +5,13 @@
mkDerivation rec {
pname = "qownnotes";
version = "22.7.6";
version = "22.8.0";
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 = "d2f0b6f62714495dd14387535ab34c0cf94d1679c5db4a257ef87bb855b7771b";
sha256 = "37ae0952119341b7a07a80bb79e732d91edab3a684b6b9a626e5a9d13a97fad1";
};
nativeBuildInputs = [ qmake qttools ];

4
pkgs/applications/terminal-emulators/hyper/default.nix
View file

@ -15,11 +15,11 @@ let
in
stdenv.mkDerivation rec {
pname = "hyper";
version = "3.2.1";
version = "3.2.3";
src = fetchurl {
url = "https://github.com/vercel/hyper/releases/download/v${version}/hyper_${version}_amd64.deb";
sha256 = "sha256-nwaJ+lnuHv+Qb/QkKF/9jG8cvq1Z+urz8CPwxSsMmuA=";
sha256 = "sha256-CHLkHH9u5YWlmRDa4H3ymqg1YMBYjo+kuxpu0OVv4E8=";
};
nativeBuildInputs = [ dpkg ];

4
pkgs/development/python-modules/aioaladdinconnect/default.nix
View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aioaladdinconnect";
version = "0.1.34";
version = "0.1.41";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "AIOAladdinConnect";
inherit version;
hash = "sha256-p5O4tm+m0ThJS/VTqhMNs2bwA2S6kJ2reQ2BoTHmLz8=";
hash = "sha256-o9dwGBMDL8kweqts4t73vxXQrVxYn9dBJDudpQNkKdo=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/aiohomekit/default.nix
View file

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "aiohomekit";
version = "1.2.3";
version = "1.2.5";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "Jc2k";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-cO+XHdHyz6W6PAoLNgazA4CifBfpLqCQoz1KtpcEAmg=";
hash = "sha256-aZNvKrOKYfrpyteFe4iDLUqlk9n3tMGwatNrV5r8mgg=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/bleak-retry-connector/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "bleak-retry-connector";
version = "1.2.0";
version = "1.3.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-nFlh+/6aDHNntHDxdkE2413ZLM7Z84lcn7xFKWdJ/U8=";
hash = "sha256-WjjpehrYy9187C3wUDR3sfQG+2p6YbQfp4EwC5FbzGU=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/bleak/default.nix
View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "bleak";
version = "0.15.0";
version = "0.15.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-qth0iBPbY7tgSCD/0rU3CgbJwCckoN7Fb7g1EAdPzjk=";
hash = "sha256-2MjYjeDyKhW9E1ugVsTlsvufFRGSg97yGx7X1DwA1ZA=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pyrisco/default.nix
View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pyrisco";
version = "0.5.1";
version = "0.5.2";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "OnFreund";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2v5fkawGy20vmKu/Fz29jnxmcpMl4HGNTNE9r2p6zDc=";
sha256 = "sha256-gRAQARdVZWpFHx0nE4xRktIP2p4ggp9/95VO9nNd/1w=";
};
propagatedBuildInputs = [ aiohttp ];

3
pkgs/games/steam/fhsenv.nix
View file

@ -95,9 +95,11 @@ in buildFHSUserEnv rec {
json-glib # paradox launcher (Stellaris)
libdrm
libxkbcommon # paradox launcher
libvorbis # Dead Cells
mono
xorg.xkeyboardconfig
xorg.libpciaccess
xorg.libXScrnSaver # Dead Cells
udev # shadow of the tomb raider
icu # dotnet runtime, e.g. stardew valley
@ -182,6 +184,7 @@ in buildFHSUserEnv rec {
flac
freeglut
libjpeg
libpng
libpng12
libsamplerate
libmikmod

4
pkgs/games/wesnoth/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "wesnoth";
version = "1.16.3";
version = "1.16.4";
src = fetchFromGitHub {
rev = version;
owner = "wesnoth";
repo = "wesnoth";
sha256 = "sha256-om6Tps5ZdAWq1WE9lq9v2oGwfPDPSRJ08pmMlT6DjGk=";
sha256 = "sha256-yb/Y54MVtzIi5+FnQQZTNDNGgkPn0j2n+7cH6qejAO0=";
};
nativeBuildInputs = [ cmake pkg-config ];

16
pkgs/os-specific/linux/apfs/default.nix
View file

@ -1,30 +1,20 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, kernel
}:
stdenv.mkDerivation {
pname = "apfs";
version = "unstable-2022-02-03-${kernel.version}";
version = "unstable-2022-07-24-${kernel.version}";
src = fetchFromGitHub {
owner = "linux-apfs";
repo = "linux-apfs-rw";
rev = "a0d6a4dca69b6eab3cabaaee4d4284807828a266";
sha256 = "sha256-3T1BNc6g3SDTxb0VrronLUIp/CWbwnzXTsc8Qk5c4jY=";
rev = "925d86b7be3ccf21b17734cfececf40e43c4598e";
sha256 = "sha256-N5lGJu4c03cVDk3WTcegzZHBDmguPEX8dCedJS2TMSI=";
};
patches = [
# Fix build for Linux 5.18+.
# https://github.com/linux-apfs/linux-apfs-rw/pull/24
(fetchpatch {
url = "https://github.com/linux-apfs/linux-apfs-rw/commit/93b93767acab614c4e6426c9fd38bdf9af00bc13.patch";
sha256 = "1ss7cal851qadcmkn3jcckpa2f003nzb03xsx1g8vkb1cl0n8gi7";
})
];
hardeningDisable = [ "pic" ];
nativeBuildInputs = kernel.moduleBuildDependencies;

3
pkgs/servers/home-assistant/component-packages.nix
View file

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.8.0";
version = "2022.8.1";
components = {
"abode" = ps: with ps; [
abodepy
@ -867,6 +867,7 @@
pyflume
];
"flunearyou" = ps: with ps; [
aiohttp-cors
pyflunearyou
];
"flux" = ps: with ps; [

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

@ -296,7 +296,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.8.0";
hassVersion = "2022.8.1";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -314,7 +314,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-nxSOl4K8XZWesv6o6O+YuJFrza0sEz9atiw+ZP9A5ww=";
hash = "sha256-0QhWusJ7vSiudigJTo4KiXqO0OWgIlvqkSpiK5FFI+g=";
};
# leave this in, so users don't have to constantly update their downstream patch handling

6
pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "rust-synapse-compress-state";
version = "0.1.2";
version = "0.1.3";
src = fetchFromGitHub {
owner = "matrix-org";
repo = pname;
rev = "v${version}";
sha256 = "sha256-uL7uoJPvZoTbrmEFY7jiBphvjWSRpH9pyk3x7s3Yvrs=";
sha256 = "sha256-SSfVtG8kwHarVbB1O7xC2SSbUpPGYMHTMyoxu8mpEk0=";
};
cargoSha256 = "sha256-3w5RyVrpCnetXnxnzgVl94kUZa+1i9bU2O8vp7sb3lY=";
cargoSha256 = "sha256-PG+UeovhJMsIlm5dOYdtMxbUxZjwG3V59kAcB9aFP5c=";
cargoBuildFlags = [
"--all"

6
pkgs/servers/openvscode-server/default.nix
View file

@ -27,13 +27,13 @@ let
in stdenv.mkDerivation rec {
pname = "openvscode-server";
version = "1.66.0";
version = "1.69.2";
src = fetchFromGitHub {
owner = "gitpod-io";
repo = "openvscode-server";
rev = "openvscode-server-v${version}";
sha256 = "g5QaxZDVXvE/vOe2BjBXlqYLGZ2EG4nTKdUlLdt8H8A=";
sha256 = "e2vEEZg2H37oFRN+0kZnWW5RU2ma2JJR66XLFDNEOXc=";
};
yarnCache = stdenv.mkDerivation {
@ -56,7 +56,7 @@ in stdenv.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-BeVJsruiRLReGMwThfcEm/ez4UFcr0oI4wwevJwxt58=";
outputHash = "sha256-5wOR7rKzGLE8EAlGd4CkrFUsUOEJOdwuNWQzEdbAL+g=";
};
# Extract the Node.js source code which is used to compile packages with

2
pkgs/tools/X11/caffeine-ng/default.nix
View file

@ -40,7 +40,7 @@ in buildPythonApplication rec {
sha256 = "sha256-umIjXJ0et6Pi5Ejj96Q+ZhiKS+yj7bsgb4uQW6Ym6rU=";
};
nativeBuildInputs = [ wrapGAppsHook glib setuptools-scm ];
nativeBuildInputs = [ wrapGAppsHook glib gobject-introspection setuptools-scm ];
buildInputs = [
libappindicator-gtk3

4
pkgs/tools/misc/plantuml/default.nix
View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec {
version = "1.2022.5";
version = "1.2022.6";
pname = "plantuml";
src = fetchurl {
url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar";
sha256 = "sha256-Mi5aH5tlbo8qDj91ZTglFCKETcbXPfTQsBnhYOHrXpQ=";
sha256 = "sha256-J3EfNwDYQ2CO5qWH37wMKtdLStGjHu75wfEMX5Y2NeE=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/tools/misc/tldr/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "tldr";
version = "1.4.3";
version = "1.5.0";
src = fetchFromGitHub {
owner = "tldr-pages";
repo = "tldr-cpp-client";
rev = "v${version}";
sha256 = "sha256-ZNUW2PebRUDLcZ2/dXClXqf8NUjgw6N73h32PJ8iwmM=";
sha256 = "sha256-xim5SB9/26FMjLqhiV+lj+Rm5Tk5luSIqwyYb3kXoFY=";
};
buildInputs = [ curl libzip ];

4
pkgs/tools/text/poedit/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "poedit";
version = "3.1";
version = "3.1.1";
src = fetchFromGitHub {
owner = "vslavik";
repo = "poedit";
rev = "v${version}-oss";
sha256 = "sha256-Wxj1xPbtupEnzuvf7JdUgdTxX2oAZDEYk6W4CjrmRRE=";
sha256 = "sha256-kun1x1ql8KLS1+nh5+iItxYZnfvFcrx62cvX4OEczG4=";
};
nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook

2
pkgs/top-level/all-packages.nix
View file

@ -10050,7 +10050,7 @@ with pkgs;
qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { };
qownnotes = libsForQt514.callPackage ../applications/office/qownnotes { };
qownnotes = libsForQt5.callPackage ../applications/office/qownnotes { };
qpdf = callPackage ../development/libraries/qpdf { };