b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-10-02 12:01:22 +00:00 committed by GitHub
parent 532efa8827 f3ec61b6df
commit fc393d5731
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 725 additions and 681 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
nixos/modules/services/networking/nix-serve.nix
View file

@ -26,6 +26,15 @@ in
''; '';
}; };
package = mkOption {
type = types.package;
default = pkgs.nix-serve;
defaultText = literalExpression "pkgs.nix-serve";
description = lib.mdDoc ''
nix-serve package to use.
'';
};
openFirewall = mkOption { openFirewall = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -70,7 +79,7 @@ in
${lib.optionalString (cfg.secretKeyFile != null) '' ${lib.optionalString (cfg.secretKeyFile != null) ''
export NIX_SECRET_KEY_FILE="$CREDENTIALS_DIRECTORY/NIX_SECRET_KEY_FILE" export NIX_SECRET_KEY_FILE="$CREDENTIALS_DIRECTORY/NIX_SECRET_KEY_FILE"
''} ''}
exec ${pkgs.nix-serve}/bin/nix-serve --listen ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams} exec ${cfg.package}/bin/nix-serve --listen ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}
''; '';
serviceConfig = { serviceConfig = {

4
pkgs/applications/audio/cozy/default.nix
View file

@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
format = "other"; # no setup.py format = "other"; # no setup.py
pname = "cozy"; pname = "cozy";
version = "1.2.0"; version = "1.2.1";
# Temporary fix # Temporary fix
# See https://github.com/NixOS/nixpkgs/issues/57029 # See https://github.com/NixOS/nixpkgs/issues/57029
@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec {
owner = "geigi"; owner = "geigi";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0igqf9b77i13sxlk4ziw549h379hmz1slrb3vvf8irk94gxabsaw"; hash = "sha256-cRqfLFLvje8lxUZ4S83UAFyYUX0vj1ZgLG0Y6gpCfmI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/applications/blockchains/monero-cli/default.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "monero-cli"; pname = "monero-cli";
version = "0.18.1.1"; version = "0.18.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "monero-project"; owner = "monero-project";
repo = "monero"; repo = "monero";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-R3ajdsHVgvkUEwaShwMvhIrcbM4YjsXgBk2QGBhxGRQ="; sha256 = "sha256-yV1ysoesEcjL+JX6hkmcrBDmazOWBvYK6EjshxJzcAw=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

4
pkgs/applications/blockchains/monero-gui/default.nix
View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "monero-gui"; pname = "monero-gui";
version = "0.18.1.1"; version = "0.18.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "monero-project"; owner = "monero-project";
repo = "monero-gui"; repo = "monero-gui";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-mxbr02Ba/BeUiAZujnBdXgJSaq6a/U4GM7rR7sZzTWc="; sha256 = "sha256-GBILqNkYQUkil1qvYnJTkHwgK3dzKR9I9GVbbLy/0UU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

1
pkgs/applications/file-managers/portfolio-filemanager/default.nix
View file

@ -47,6 +47,7 @@ python3.pkgs.buildPythonApplication rec {
buildInputs = [ buildInputs = [
glib glib
gtk3
gobject-introspection gobject-introspection
libhandy libhandy
librsvg librsvg

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

@ -2,17 +2,17 @@
buildGoModule rec { buildGoModule rec {
pname = "mangal"; pname = "mangal";
version = "3.10.0"; version = "3.11.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "metafates"; owner = "metafates";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-rWj9CknWNI6SSh0AwaPpj5TxHQzkAmaAhWW7kze3xiY="; hash = "sha256-gBHNB3s7RHHxlxgeUFmxOdYvPaI78AzL4vRaCmXKgus=";
}; };
proxyVendor = true; proxyVendor = true;
vendorSha256 = "sha256-ZgeG8S78/yS9KfEK1bZ3VlQGmZPBo9TXLQLz8rXOEGo="; vendorSha256 = "sha256-Faz/cujnbK83vrIM1KUWXbUzNIB9eYAWCqWs+oJ1sYk=";
ldflags = [ "-s" "-w" ]; ldflags = [ "-s" "-w" ];

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

@ -15,13 +15,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "p2pool"; pname = "p2pool";
version = "2.3"; version = "2.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SChernykh"; owner = "SChernykh";
repo = "p2pool"; repo = "p2pool";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-hf0iU246cmTCDYotPdTACFY135L2+cRV3FpVYnRZtRc="; sha256 = "sha256-En2ogxAD61w7DRTsCGIp6fEP/cC2A+pTYIbjeJ1MktY=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

7
pkgs/applications/networking/instant-messengers/baresip/default.nix
View file

@ -25,17 +25,14 @@
, libvpx , libvpx
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.7.0"; version = "2.8.1";
pname = "baresip"; pname = "baresip";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "baresip"; owner = "baresip";
repo = "baresip"; repo = "baresip";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ouevompKkWn5CXuDcPuKiTE9GrIXBs/NFsNu6GHgReE="; sha256 = "sha256-qtdwFAJLsHqhYVmD1YRUw0NMqX+Vq5BHR5mMvZISnuY=";
}; };
postPatch = ''
patchShebangs modules/ctrl_dbus/gen.sh
'';
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
zlib zlib

4
pkgs/applications/video/media-downloader/default.nix
View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "media-downloader"; pname = "media-downloader";
version = "2.5.0"; version = "2.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mhogomchungu"; owner = "mhogomchungu";
repo = pname; repo = pname;
rev = "${version}"; rev = "${version}";
sha256 = "sha256-xoRbNbzFa1CEB4x9JLkVMrkEqaCgweFzvI0Qr9Fl4zs="; sha256 = "sha256-pDldAg4q6qGvRHuffKU49akDwwSTNCZPJ6AgauxgotI=";
}; };
nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ]; nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ];

6
pkgs/applications/virtualization/nixpacks/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "nixpacks"; pname = "nixpacks";
version = "0.8.0"; version = "0.9.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "railwayapp"; owner = "railwayapp";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-5ImGG3sovDFya1o6bbEu3JaS3xUaO9gfAnw28GZf2aU="; sha256 = "sha256-dIQS/Z1vAVHyX58RfpQWcNHyNvNdYbnx73TDEQGQt80=";
}; };
cargoSha256 = "sha256-WAnFucDCG0h+tfy6wHyWjIU7HpJ4Qylxw2Q4sgZgp7I="; cargoSha256 = "sha256-actzR0YCHOydqFp6KhwTUUj3dhGV6D+zk9+PHU3FKlM=";
# skip test due FHS dependency # skip test due FHS dependency
doCheck = false; doCheck = false;

4
pkgs/applications/window-managers/gamescope/default.nix
View file

@ -26,7 +26,7 @@
}: }:
let let
pname = "gamescope"; pname = "gamescope";
version = "3.11.45-2"; version = "3.11.47";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit pname version; inherit pname version;
@ -35,7 +35,7 @@ stdenv.mkDerivation {
owner = "Plagman"; owner = "Plagman";
repo = "gamescope"; repo = "gamescope";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-OLPwUELahqzmOBPvJg8pm556RH+H6TzRD9PHLnM2Ruc="; hash = "sha256-GkvujrYc7dBbsGqeG0THqtEAox+VZ3DoWQK4gkHo+ds=";
}; };
patches = [ ./use-pkgconfig.patch ]; patches = [ ./use-pkgconfig.patch ];

4
pkgs/applications/window-managers/phosh/default.nix
View file

@ -32,7 +32,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "phosh"; pname = "phosh";
version = "0.21.0"; version = "0.21.1";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects
sha256 = "sha256-NJLuOUBQmgphGMFZN3MsIOP99YI+CxyR+JuybX3Vnpc="; sha256 = "sha256-I0BWwEKvOYQ1s2IpvV70GWxhARdX6AZ+B4ypnTlLlDw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

35
pkgs/applications/window-managers/weston/default.nix
View file

@ -1,35 +1,27 @@
{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, wayland-scanner, python3 { lib, stdenv, fetchurl
, wayland, libGL, mesa, libxkbcommon, cairo, libxcb , meson, ninja, pkg-config, python3, wayland-scanner
, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev , cairo, colord, dbus, lcms2, libGL, libXcursor, libdrm, libevdev, libinput
, colord, lcms2, pipewire ? null , libjpeg, libseat, libxcb, libxkbcommon, mesa, mtdev, pam, udev, wayland
, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , wayland-protocols, xlibsWrapper
, libwebp ? null, xwayland ? null, wayland-protocols , pipewire ? null, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null
, libva ? null, libwebp ? null, xwayland ? null
# beware of null defaults, as the parameters *are* supplied by callPackage by default # beware of null defaults, as the parameters *are* supplied by callPackage by default
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "weston"; pname = "weston";
version = "10.0.1"; version = "11.0.0";
src = fetchurl { src = fetchurl {
url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz"; url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz";
sha256 = "05a10gfbadyxkwgsncc5vc343f493csgh10vk0878nl6d98557la"; sha256 = "078y14ff9wmmbzq314f7bq1bxx0rc12xy4j362n60iamr56qs4x6";
}; };
patches = [ nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ];
# Fix race condition in build system
(fetchpatch {
url = "https://gitlab.freedesktop.org/wayland/weston/-/commit/0d3e438d080433ed5d203c876e7de6c7f8a14f98.patch";
sha256 = "sha256-d9NG1vUIuL4jpXqCo0myz/97JuFYesH+8kJnegQXeMU=";
})
];
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner python3 ];
buildInputs = [ buildInputs = [
wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm cairo colord dbus freerdp lcms2 libGL libXcursor libdrm libevdev libinput
mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva libjpeg libseat libunwind libva libwebp libxcb libxkbcommon mesa mtdev pam
libwebp wayland-protocols pango pipewire udev vaapi wayland wayland-protocols xlibsWrapper
colord lcms2 pipewire
]; ];
mesonFlags= [ mesonFlags= [
@ -44,7 +36,6 @@ stdenv.mkDerivation rec {
"-Dtest-junit-xml=false" "-Dtest-junit-xml=false"
# TODO: # TODO:
#"--enable-clients" #"--enable-clients"
#"--disable-setuid-install" # prevent install target to chown root weston-launch, which fails
] ++ lib.optionals (xwayland != null) [ ] ++ lib.optionals (xwayland != null) [
"-Dxwayland-path=${xwayland.out}/bin/Xwayland" "-Dxwayland-path=${xwayland.out}/bin/Xwayland"
]; ];

6
pkgs/data/icons/pop-icon-theme/default.nix
View file

@ -10,13 +10,13 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "pop-icon-theme"; pname = "pop-icon-theme";
version = "2021-11-17"; version = "3.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pop-os"; owner = "pop-os";
repo = "icon-theme"; repo = "icon-theme";
rev = "9998b20b78f3ff65ecbf2253bb863d1e669abe74"; rev = "v${version}";
sha256 = "0lwdmaxs9xj4bm21ldh64bzyb6iz5d5k1256iwvyjp725l7686cl"; sha256 = "sha256-7cDXEkqtPNQsyZvuYZhBSgAYshkDlP8o8umWGbNLtjw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

27
pkgs/data/misc/clash-geoip/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "clash-geoip";
version = "20220912";
src = ./.;
data = fetchurl {
url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb";
sha256 = "sha256-YIQjuWbizheEE9kgL+hBS1GAGf2PbpaW5mu/lim9Q9A";
};
installPhase = ''
runHook preInstall
mkdir -p $out/etc/clash
install -Dm 0644 $data -D $out/etc/clash/Country.mmdb
runHook postInstall
'';
meta = with lib; {
description = "A GeoLite2 data created by MaxMind";
homepage = "https://github.com/Dreamacro/maxmind-geoip";
license = licenses.unfree;
maintainers = with maintainers; [ candyc1oud ];
};
}

4
pkgs/development/libraries/libre/default.nix
View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, zlib, openssl }: { lib, stdenv, fetchFromGitHub, zlib, openssl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.7.0"; version = "2.8.0";
pname = "libre"; pname = "libre";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "baresip"; owner = "baresip";
repo = "re"; repo = "re";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-YGd0ft61L5ZmcWY0+wON2YgX1fKAcQlIGHNaD7I7exg="; sha256 = "sha256-mbPFaq49EI2BdhdQJwFaBxjAh2aKlcuFwoCTwhXRbUg=";
}; };
buildInputs = [ zlib openssl ]; buildInputs = [ zlib openssl ];
makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ]

4
pkgs/development/libraries/librem/default.nix
View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, zlib, openssl, libre }: { lib, stdenv, fetchFromGitHub, zlib, openssl, libre }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.7.0"; version = "2.8.0";
pname = "librem"; pname = "librem";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "baresip"; owner = "baresip";
repo = "rem"; repo = "rem";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-t+klxuDiP7KAbN3ZK8eTWHTzNNpNTrlFINktjPDfeoo="; sha256 = "sha256-/DAJMudEEB/8IYl27SFRlD57dfhZrPA5I1ycL4lFXy8=";
}; };
buildInputs = [ zlib openssl libre ]; buildInputs = [ zlib openssl libre ];
makeFlags = [ makeFlags = [

19
pkgs/development/libraries/xapian/default.nix
View file

@ -1,5 +1,13 @@
{ lib, stdenv, fetchurl, autoreconfHook { lib
, libuuid, zlib }: , stdenv
, fetchurl
, autoreconfHook
, libuuid
, zlib
# tests
, mu
}:
let let
generic = version: hash: stdenv.mkDerivation { generic = version: hash: stdenv.mkDerivation {
@ -29,9 +37,14 @@ let
--replace "#define HAVE___EXP10 1" "#undef HAVE___EXP10" --replace "#define HAVE___EXP10 1" "#undef HAVE___EXP10"
''; '';
passthru.tests = {
inherit mu;
};
meta = with lib; { meta = with lib; {
description = "Search engine library"; description = "Search engine library";
homepage = "https://xapian.org/"; homepage = "https://xapian.org/";
changelog = "https://xapian.org/docs/xapian-core-${version}/NEWS";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
platforms = platforms.unix; platforms = platforms.unix;
@ -41,5 +54,5 @@ in {
# Don't forget to change the hashes in xapian-omega and # Don't forget to change the hashes in xapian-omega and
# python3Packages.xapian. They inherit the version from this package, and # python3Packages.xapian. They inherit the version from this package, and
# should always be built with the equivalent xapian version. # should always be built with the equivalent xapian version.
xapian_1_4 = generic "1.4.20" "sha256-zivl7/cgdcgQbANA5wsQk9vOviq0LcHBvgjdOtQZRC0="; xapian_1_4 = generic "1.4.21" "sha256-gPhgNNL7VZAHlUgd+uaBv6oQ776BirrTYizcDFXgb4g=";
} }

3
pkgs/development/libraries/xapian/tools/omega/default.nix
View file

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz";
hash = "sha256-Cf19bGCzlP0A2EcAZJlpofzDqiuIuyxsoiD9+o0liB8="; hash = "sha256-iKETxVmPyVgz4SEscL5GOrudVgFWTSG4YWNvc3lVqtU=";
}; };
buildInputs = [ xapian perl pcre2 zlib libmagic ]; buildInputs = [ xapian perl pcre2 zlib libmagic ];
@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Indexer and CGI search front-end built on Xapian library"; description = "Indexer and CGI search front-end built on Xapian library";
homepage = "https://xapian.org/"; homepage = "https://xapian.org/";
changelog = "https://xapian.org/docs/xapian-omega-${version}/NEWS";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = platforms.unix; platforms = platforms.unix;
}; };

4
pkgs/development/python-modules/google-cloud-vision/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-vision"; pname = "google-cloud-vision";
version = "3.1.2"; version = "3.1.3";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-ZPuKE2GNUWD26nR+dlKAVDpQViCTCFyx+8W/448MgX4="; hash = "sha256-ciZvW7TDtyqCcWfk3DJ/uhXLQtFNFwetTxd/R/p8fDQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

3
pkgs/development/python-modules/xapian/default.nix
View file

@ -13,7 +13,7 @@ buildPythonPackage rec {
src = fetchurl { src = fetchurl {
url = "https://oligarchy.co.uk/xapian/${version}/xapian-bindings-${version}.tar.xz"; url = "https://oligarchy.co.uk/xapian/${version}/xapian-bindings-${version}.tar.xz";
hash = "sha256-eGzCjQVmCyJ5VEE68OL2bk6tKgbT322rrqSERUtgHvU="; hash = "sha256-578eSYK5H4QSidGSFAIdiDccoqbHME31kEnX2ni4PO0=";
}; };
configureFlags = [ configureFlags = [
@ -36,6 +36,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Python Bindings for Xapian"; description = "Python Bindings for Xapian";
homepage = "https://xapian.org/"; homepage = "https://xapian.org/";
changelog = "https://xapian.org/docs/xapian-bindings-${version}/NEWS";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ jonringer ]; maintainers = with maintainers; [ jonringer ];
}; };

6
pkgs/development/tools/benthos/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "benthos"; pname = "benthos";
version = "4.7.0"; version = "4.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "benthosdev"; owner = "benthosdev";
repo = "benthos"; repo = "benthos";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-aj4MkVj1+9IcyiPWOilrk/x5Rwtoq9wwP4oCtgeb+vU="; sha256 = "sha256-jddPUNl+W8BYpBlz3h/bsz7xFvE8tSlaagBmUbOGfFI=";
}; };
vendorSha256 = "sha256-aQ3z8KBTLHNs5y+8I02AIZc7p5fr10GA99YdizwSJko="; vendorSha256 = "sha256-xnrw/rXOGlZduCG/Sy4GxGJaojtve+oe2zVf3sV3lJ4=";
doCheck = false; doCheck = false;

6
pkgs/development/tools/metal-cli/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "metal-cli"; pname = "metal-cli";
version = "0.10.0"; version = "0.10.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "equinix"; owner = "equinix";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-bXea270m0+JAQ3j+JhkiVNds2X7rogcIqJIqRK7DS2g="; sha256 = "sha256-DjsJ/pJu62hn89KhOgQAT5gZcMD+5fF4IXU0PL7Pzdo=";
}; };
vendorSha256 = "sha256-bCVHPpdQSlEU7smoQzpiLZMQVPUQO8UhylrpDf0MSmk="; vendorSha256 = "sha256-eH/T5KlFvZx7sCZHLn0GNIAwTizLglvv9BoDndcJivo=";
ldflags = [ ldflags = [
"-s" "-w" "-s" "-w"

8
pkgs/development/tools/misc/iozone/default.nix
View file

@ -14,16 +14,16 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "iozone"; pname = "iozone";
version = "3.490"; version = "3.493";
src = fetchurl { src = fetchurl {
url = "http://www.iozone.org/src/current/iozone${lib.replaceStrings ["."] ["_"] version}.tar"; url = "http://www.iozone.org/src/current/iozone${lib.replaceStrings ["."] ["_"] version}.tgz";
sha256 = "1vagmm2k2bzlpahl2a2arpfmk3cd5nzhxi842a8mdag2b8iv9bay"; hash = "sha256-Y0wSNgC0u0LoJ0g/oVsq+uba2ikHt4SxTgFBWTPUMZg=";
}; };
license = fetchurl { license = fetchurl {
url = "http://www.iozone.org/docs/Iozone_License.txt"; url = "http://www.iozone.org/docs/Iozone_License.txt";
sha256 = "1309sl1rqm8p9gll3z8zfygr2pmbcvzw5byf5ba8y12avk735zrv"; hash = "sha256-O/8yztxKBI/UKs6vwv9mq16Rn3cf/UHpSxdVnAPVCYw=";
}; };
preBuild = "pushd src/current"; preBuild = "pushd src/current";

12
pkgs/development/tools/pactorio/default.nix
View file

@ -10,27 +10,27 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "pactorio"; pname = "pactorio";
version = "0.5.2"; version = "0.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "figsoda"; owner = "figsoda";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-tRmchXDg8flvByjg6GLwwdwQgp/5NdZIgnjYgPLcLP8="; sha256 = "sha256-3+irejeDltf7x+gyJxWBgvPgpQx5uU3DewU23Z4Nr/A=";
}; };
cargoSha256 = "sha256-FIn+6wflDAjshP2Vz/rXRTrrjPQFW63XtXo8hBHMdkg="; cargoSha256 = "sha256-sAFsG+EPSmvPDFR9R0fZ5f+y/PXVpTJlMzL61vwf4SY=";
nativeBuildInputs = [ installShellFiles pkg-config ]; nativeBuildInputs = [ installShellFiles pkg-config ];
buildInputs = [ bzip2 ] ++ lib.optional stdenv.isDarwin Security; buildInputs = [ bzip2 ] ++ lib.optional stdenv.isDarwin Security;
postInstall = '' postInstall = ''
completions=($releaseDir/build/pactorio-*/out/completions) installManPage artifacts/pactorio.1
installShellCompletion $completions/pactorio.{bash,fish} --zsh $completions/_pactorio installShellCompletion artifacts/pactorio.{bash,fish} --zsh artifacts/_pactorio
''; '';
GEN_COMPLETIONS = 1; GEN_ARTIFACTS = "artifacts";
meta = with lib; { meta = with lib; {
description = "Mod packager for factorio"; description = "Mod packager for factorio";

6
pkgs/development/tools/rust/cargo-nextest/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-nextest"; pname = "cargo-nextest";
version = "0.9.36"; version = "0.9.37";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nextest-rs"; owner = "nextest-rs";
repo = "nextest"; repo = "nextest";
rev = "cargo-nextest-${version}"; rev = "cargo-nextest-${version}";
sha256 = "sha256-gp/XEhSNdoEs3+KXbbgbjRg29xHyHuAbYLBVvNDIgLw="; sha256 = "sha256-fEBTBQyw+yA2O4DGIOcGRo5AqaVZXRNdxi9ImjKiXwE=";
}; };
cargoSha256 = "sha256-mz2zJwA05Wg6g+u7LfANMt+wwoZIQzb2mH3Y+b4SBr0="; cargoSha256 = "sha256-yXkjCZHAH2Rfp0T2v2OoBskolqvUQwTRlF99gI259F8=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ];

4
pkgs/development/tools/skopeo/default.nix
View file

@ -15,13 +15,13 @@
buildGoModule rec { buildGoModule rec {
pname = "skopeo"; pname = "skopeo";
version = "1.9.2"; version = "1.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "containers"; owner = "containers";
repo = "skopeo"; repo = "skopeo";
sha256 = "sha256-F2kIFBsLhjV8Ecof05Ii5TzneEUdl9dmCZ2NhOABdmc="; sha256 = "sha256-Q6gdkaIYTDUqDbjmE9TcRtQcHjpOJ3bXLJtN8NPp9KA=";
}; };
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];

10
pkgs/os-specific/linux/kernel/zen-kernels.nix
View file

@ -4,16 +4,16 @@ let
# comments with variant added for update script # comments with variant added for update script
# ./update-zen.py zen # ./update-zen.py zen
zenVariant = { zenVariant = {
version = "5.19.11"; #zen version = "5.19.12"; #zen
suffix = "zen1"; #zen suffix = "zen1"; #zen
sha256 = "0slrbsqdvnlnk2hr356wjmbhh8qkn39k34jn1lidhjyfb9c7fg6a"; #zen sha256 = "001zrsgsg5yl74yn4qdmykwmys4mdwnnbiqmfpw60i3qr5ig90ap"; #zen
isLqx = false; isLqx = false;
}; };
# ./update-zen.py lqx # ./update-zen.py lqx
lqxVariant = { lqxVariant = {
version = "5.19.11"; #lqx version = "5.19.12"; #lqx
suffix = "lqx2"; #lqx suffix = "lqx1"; #lqx
sha256 = "1j6mr3ibl99l23wyycs5m1zmclp1qwbw5in36hi0pfq04jx2l6cn"; #lqx sha256 = "19y3znj3zjifkd1m8agb8f80kzfs1rx1ccpnq7fvkd7j4yd3khlf"; #lqx
isLqx = true; isLqx = true;
}; };
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

42
pkgs/servers/home-assistant/cli.nix
View file

@ -1,28 +1,18 @@
{ lib { lib
, fetchFromGitHub
, python3 , python3
}: }:
let python3.pkgs.buildPythonApplication rec {
python = python3.override {
packageOverrides = self: super: {
click = super.click.overrideAttrs (oldAttrs: rec {
version = "8.0.4";
src = oldAttrs.src.override {
inherit version;
sha256 = "sha256-hFjXsSh8X7EoyQ4jOBz5nc3nS+r2x/9jhM6E1v4JCts=";
};
});
};
};
in
python.pkgs.buildPythonApplication rec {
pname = "homeassistant-cli"; pname = "homeassistant-cli";
version = "0.9.4"; version = "0.9.5";
format = "setuptools";
src = python3.pkgs.fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "home-assistant-ecosystem";
sha256 = "03kiyqpp3zf8rg30d12h4fapihh0rqwpv5p8jfxb3iq0chfmjx2f"; repo = "home-assistant-cli";
rev = version;
hash = "sha256-gtyW5FnpzUv/3TuBZ0LJXPxeQAkl7bf8M+K6RNATVm0=";
}; };
postPatch = '' postPatch = ''
@ -30,7 +20,7 @@ python.pkgs.buildPythonApplication rec {
sed -i "s/'\(.*\)\(==\|>=\).*'/'\1'/g" setup.py sed -i "s/'\(.*\)\(==\|>=\).*'/'\1'/g" setup.py
''; '';
propagatedBuildInputs = with python.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
aiohttp aiohttp
click click
click-log click-log
@ -44,19 +34,25 @@ python.pkgs.buildPythonApplication rec {
tabulate tabulate
]; ];
# Completion needs to be ported to work with click > 8.0 # TODO: Completion needs to be adapted after support for latest click was added
# https://github.com/home-assistant-ecosystem/home-assistant-cli/issues/367 # $ source <(_HASS_CLI_COMPLETE=bash_source hass-cli) # for bash
# $ source <(_HASS_CLI_COMPLETE=zsh_source hass-cli) # for zsh
# $ eval (_HASS_CLI_COMPLETE=fish_source hass-cli) # for fish
#postInstall = '' #postInstall = ''
# mkdir -p "$out/share/bash-completion/completions" "$out/share/zsh/site-functions" # mkdir -p "$out/share/bash-completion/completions" "$out/share/zsh/site-functions"
# $out/bin/hass-cli completion bash > "$out/share/bash-completion/completions/hass-cli" # $out/bin/hass-cli completion bash > "$out/share/bash-completion/completions/hass-cli"
# $out/bin/hass-cli completion zsh > "$out/share/zsh/site-functions/_hass-cli" # $out/bin/hass-cli completion zsh > "$out/share/zsh/site-functions/_hass-cli"
#''; #'';
checkInputs = with python.pkgs; [ checkInputs = with python3.pkgs; [
pytestCheckHook pytestCheckHook
requests-mock requests-mock
]; ];
pythonImportsCheck = [
"homeassistant_cli"
];
meta = with lib; { meta = with lib; {
description = "Command-line tool for Home Assistant"; description = "Command-line tool for Home Assistant";
homepage = "https://github.com/home-assistant-ecosystem/home-assistant-cli"; homepage = "https://github.com/home-assistant-ecosystem/home-assistant-cli";

6
pkgs/servers/kubemq-community/default.nix
View file

@ -2,12 +2,12 @@
buildGoModule rec { buildGoModule rec {
pname = "kubemq-community"; pname = "kubemq-community";
version = "2.2.13"; version = "2.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubemq-io"; owner = "kubemq-io";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-YeFSea6aCNH+v3AKqiG8BY4u7/enmOPlEybkz6RwU8w="; sha256 = "sha256-E4X8srrfbOHV2XmjaXV25WilIjBGPjEGD6BqK7HreoQ=";
}; };
CGO_ENABLED=0; CGO_ENABLED=0;
@ -16,7 +16,7 @@ buildGoModule rec {
doCheck = false; # grpc tests are flaky doCheck = false; # grpc tests are flaky
vendorSha256 = "sha256-pRbYNR3z4KdA9pdthX8a3FZ0LNyvoT+PR+6OinDGF2g="; vendorSha256 = "sha256-kvQ5sPMudI75fVIWJkkwXpmVrJysvWcIgpgjyQh19W0=";
meta = { meta = {
homepage = "https://github.com/kubemq-io/kubemq-community"; homepage = "https://github.com/kubemq-io/kubemq-community";

4
pkgs/servers/zigbee2mqtt/default.nix
View file

@ -3,14 +3,14 @@ let
package = (import ./node.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; }).package; package = (import ./node.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; }).package;
in in
package.override rec { package.override rec {
version = "1.27.2"; version = "1.28.0";
reconstructLock = true; reconstructLock = true;
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "Koenkk"; owner = "Koenkk";
repo = "zigbee2mqtt"; repo = "zigbee2mqtt";
rev = version; rev = version;
sha256 = "FwW3hnZsOitdFjhiZFAyM5aBH0/LO05SG0TyavqNiHw="; sha256 = "0GVU2bjghFdNyXljUGzxO71qhbHMVoO7I4E2c237+mw=";
}; };
passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;

1116
pkgs/servers/zigbee2mqtt/node-packages.nix generated
View file

File diff suppressed because it is too large Load diff

6
pkgs/tools/security/kdigger/default.nix
View file

@ -7,13 +7,13 @@
buildGoModule rec { buildGoModule rec {
pname = "kdigger"; pname = "kdigger";
version = "1.3.0"; version = "1.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "quarkslab"; owner = "quarkslab";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-2H7aQoKtNABNI7R01ZOyHCFYUBIu1C7O0snO/i9807o="; sha256 = "sha256-/KkqwjFxTipa5dCVRFlrKzl+PB4QB4aY0wjlsi1Phug=";
# populate values that require us to use git. By doing this in postFetch we # populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src. # can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true; leaveDotGit = true;
@ -23,7 +23,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf find "$out" -name .git -print0 | xargs -0 rm -rf
''; '';
}; };
vendorSha256 = "sha256-Whw8zdfipbWjOXYEAQayfttH0GTTRdJAVjmvLjmsZPw="; vendorSha256 = "sha256-rDJFowbOj77n/sBoDgFEF+2PgghxufvIgzbMqrHehws=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

4
pkgs/tools/text/xml/basex/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "basex"; pname = "basex";
version = "10.1"; version = "10.2";
src = fetchurl { src = fetchurl {
url = "http://files.basex.org/releases/${version}/BaseX${builtins.replaceStrings ["."] [""] version}.zip"; url = "http://files.basex.org/releases/${version}/BaseX${builtins.replaceStrings ["."] [""] version}.zip";
hash = "sha256-d11kqwsLsHopFi7w+wTDWx9h+UVM7Z5kY7vKXsBrvuo="; hash = "sha256-byx1gY/tzUmdi120tQzUywj9XroLyxYVMb4UilkChNk=";
}; };
nativeBuildInputs = [ unzip copyDesktopItems ]; nativeBuildInputs = [ unzip copyDesktopItems ];

10
pkgs/tools/wayland/wayland-utils/default.nix
View file

@ -1,21 +1,21 @@
{ lib, stdenv, fetchurl { lib, stdenv, fetchurl
, meson, pkg-config, ninja, wayland-scanner , meson, pkg-config, ninja, wayland-scanner
, wayland, wayland-protocols , libdrm, wayland, wayland-protocols
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wayland-utils"; pname = "wayland-utils";
version = "1.0.0"; version = "1.1.0";
src = fetchurl { src = fetchurl {
url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; url = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/${version}/downloads/wayland-utils-${version}.tar.xz";
sha256 = "1h38l850ww6hxjb1l8iwa33nkbz8q88bw6lh0aryjyp8b16crzk4"; sha256 = "sha256-nmhYYwJbT+reNtU7vI4xtD4mSYvnQ96oTHqEkSlZQQo=";
}; };
strictDeps = true; strictDeps = true;
depsBuildBuild = [ pkg-config ]; depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson pkg-config ninja wayland-scanner ]; nativeBuildInputs = [ meson pkg-config ninja wayland-scanner ];
buildInputs = [ wayland wayland-protocols ]; buildInputs = [ libdrm wayland wayland-protocols ];
meta = with lib; { meta = with lib; {
description = "Wayland utilities (wayland-info)"; description = "Wayland utilities (wayland-info)";

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

@ -3343,6 +3343,8 @@ with pkgs;
clash = callPackage ../tools/networking/clash { }; clash = callPackage ../tools/networking/clash { };
clash-geoip = callPackage ../data/misc/clash-geoip { };
clasp = callPackage ../tools/misc/clasp { }; clasp = callPackage ../tools/misc/clasp { };
clevercsv = with python3Packages; toPythonApplication clevercsv; clevercsv = with python3Packages; toPythonApplication clevercsv;