swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-11-22 12:01:52 +00:00 committed by GitHub
parent befa1f2dc6 aab1a7cbca
commit 52bca233ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 40 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml
View file

@ -211,7 +211,7 @@ $ sudo groupdel nixbld
Generate your NixOS configuration:
</para>
<programlisting>
$ sudo `which nixos-generate-config` --root /
$ sudo `which nixos-generate-config`
</programlisting>
<para>
Note that this will place the generated configuration files in

2
nixos/doc/manual/installation/installing-from-other-distro.section.md
View file

@ -148,7 +148,7 @@ The first steps to all these are the same:
Generate your NixOS configuration:
```ShellSession
$ sudo `which nixos-generate-config` --root /
$ sudo `which nixos-generate-config`
```
Note that this will place the generated configuration files in

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

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "toot";
version = "0.28.0";
version = "0.29.0";
src = fetchFromGitHub {
owner = "ihabunek";
repo = "toot";
rev = version;
sha256 = "076r6l89gxjwxjpiklidcs8yajn5c2bnqjvbj4wc559iqdqj88lz";
rev = "refs/tags/${version}";
sha256 = "sha256-SrPjotEkP8Z2uYB/4eAJAk3Zmzmr0xET69PmkxQCwFQ=";
};
checkInputs = with python3Packages; [ pytest ];

8
pkgs/applications/networking/irc/senpai/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "senpai";
version = "unstable-2022-11-04";
version = "unstable-2022-11-15";
src = fetchFromSourcehut {
owner = "~taiite";
repo = "senpai";
rev = "3be87831281af1c91a6e406986f317936a0b98bc";
sha256 = "sha256-v8r2q2H4I9FnsIOGv1zkC4xJ5E9cQavfILZ6mnbFbr8=";
rev = "cb0ba0669522ecf8ab0b0c3ccd0f14827eb65832";
sha256 = "sha256-Ny7TAKdh7RFGlrMRVIyCFFLqOanNWK+qGBbh+dVngMs=";
};
vendorSha256 = "sha256-FBpk9TpAD5i3+brsVNWHNHJtZsHmShmWlldQrMs/VGU=";
vendorSha256 = "sha256-dCADJ+k2vWLpgN251/gEyAg6WhPGK2DEWRaAHSHp1aM=";
subPackages = [
"cmd/senpai"

4
pkgs/applications/networking/remote/teamviewer/default.nix
View file

@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg-utils, dbus
, qtbase, qtwebkit, qtwebengine, qtx11extras, qtquickcontrols, getconf, glibc
, qtbase, qtwebengine, qtx11extras, qtquickcontrols, getconf, glibc
, libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes, coreutils
, wrapQtAppsHook
}:
@ -21,7 +21,7 @@ mkDerivation rec {
'';
nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapQtAppsHook ];
buildInputs = [ dbus getconf qtbase qtwebkit qtwebengine qtx11extras libX11 ];
buildInputs = [ dbus getconf qtbase qtwebengine qtx11extras libX11 ];
propagatedBuildInputs = [ qtquickcontrols ];
installPhase = ''

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

@ -41,12 +41,12 @@
stdenv.mkDerivation rec {
pname = "zotero";
version = "6.0.16";
version = "6.0.18";
src = fetchurl {
url =
"https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
sha256 = "sha256-PqC7PqpRSm/Yt3pK8TuzcrhtfJSeJX6th2xb2n/Bul8=";
sha256 = "sha256-MIBhvhgttqfUO42ipVNXhdKbcN/0YPtFK8Ox8KlafG0=";
};
nativeBuildInputs = [ wrapGAppsHook ];

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

@ -26,14 +26,14 @@ let
in
stdenv.mkDerivation rec {
pname = "blackbox";
version = "0.12.1";
version = "0.12.2";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "raggesilver";
repo = "blackbox";
rev = "v${version}";
sha256 = "sha256-BJtRzjNmJzabI30mySTjWXfN81xj+AWpKhIberXf6Io=";
sha256 = "sha256-4/rtviBv5KXheLLExxOvaF0wU87eRKMNxlYCVxuIQgU=";
};
postPatch = ''

6
pkgs/applications/version-management/git-and-tools/git-cliff/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-cliff";
version = "0.9.2";
version = "0.10.0";
src = fetchFromGitHub {
owner = "orhun";
repo = "git-cliff";
rev = "v${version}";
sha256 = "sha256-6OxYIr2ElyB4QHiPV/KAELmKC+qFGpgerhlDPjLvsio=";
sha256 = "sha256-f7nM4airKOTXiYEMksTCm18BN036NQLLwNcKIlhuHWs=";
};
cargoSha256 = "sha256-+C7MXmn3FrhD9UVdRmRZbH/rzleATBT0bdlQUSOae5Y=";
cargoSha256 = "sha256-wjqQAVQ1SCjD24aCwZorUhnfOKM+j9TkB84tLxeaNgo=";
# attempts to run the program on .git in src which is not deterministic
doCheck = false;

5
pkgs/development/ocaml-modules/phylogenetics/default.nix
View file

@ -40,6 +40,11 @@ buildDunePackage rec {
printbox-text
];
checkPhase = ''
runHook preCheck
dune build @app/fulltest
runHook postCheck
'';
doCheck = true;
meta = with lib; {

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

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "bellows";
version = "0.34.3";
version = "0.34.4";
format = "setuptools";
src = fetchFromGitHub {
owner = "zigpy";
repo = "bellows";
rev = "refs/tags/${version}";
sha256 = "sha256-7jaXNz7i+kF64T+5/QWKGpxHCkg/M9U2hbWrVB2tjH8=";
sha256 = "sha256-JUI2jUUc2i+/6mRYNhmuAOmAS4nCzMZwyM8ug0pOFfc=";
};
propagatedBuildInputs = [

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

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-lambda";
version = "0.11.3";
version = "0.12.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-dEJOoV91DIQL7KPbLQrgCKdCF7ZMSZMHVLq6l1sg4F0=";
sha256 = "sha256-SgA2eKXZIPWbyJkopk8E9rTgkUWl6LWP2dw2fn3H8qc=";
};
cargoSha256 = "sha256-qW4a4VPpPSdt0Z4nRA4/fHpW0cfDxOPQyEAdJidt+0o=";
cargoSha256 = "sha256-rTVc8zzbzLzP0LV8h7IWE1S+ZqDVfnO18iT0CrOrI9A=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];

6
pkgs/os-specific/linux/zfs/default.nix
View file

@ -235,10 +235,10 @@ in {
# IMPORTANT: Always use a tagged release candidate or commits from the
# zfs-<version>-staging branch, because this is tested by the OpenZFS
# maintainers.
version = "2.1.7-staging-2022-10-27";
rev = "04f1983aab16d378be376768275856bc38be48bd";
version = "2.1.7-staging-2022-11-08";
rev = "0f4ee295ba94803e5833f57481cfdbee5d1160d4";
sha256 = "sha256-6s9Qcw6Qqq7+JU9UPa8DDu2yzhD1OV3piLlYsgEoIhg=";
sha256 = "sha256-AixYjnr8MgST/VxEPY4NdcAvpoKiJ3zrvOai5bJjC/U=";
isUnstable = true;
};

6
pkgs/servers/nosql/ferretdb/default.nix
View file

@ -5,20 +5,20 @@
buildGoModule rec {
pname = "ferretdb";
version = "0.6.1";
version = "0.6.2";
src = fetchFromGitHub {
owner = "FerretDB";
repo = "FerretDB";
rev = "v${version}";
sha256 = "sha256-oSNE7JJwni+X5AiAmHLuxVI9gMh3AT84xejWgmJSlzk=";
sha256 = "sha256-wjqTYrAVrUl+i+2glSUW1xS/qjvTqRXYu4s3F5Wi0Sc=";
};
postPatch = ''
echo ${version} > internal/util/version/gen/version.txt
'';
vendorSha256 = "sha256-H/EXUPNMTD6mgcUFupxL5wTLHvAlH5L6bv2GmvsbKms=";
vendorSha256 = "sha256-wjlGAhut9/jZ2GmKg7XmenphkgxWn0VbuvYEtORpbtw=";
CGO_ENABLED = 0;

6
pkgs/servers/pocketbase/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "pocketbase";
version = "0.7.10";
version = "0.8.0";
src = fetchFromGitHub {
owner = "pocketbase";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KQMCWriPJ3fUXjG+uAqOMbR8dZDrlxQ3iDqyYHhC6hI=";
sha256 = "sha256-z7Vs+Z34r5g62X9DnEVkqTrr+V2bWwkfMXitNz+pVN8=";
};
vendorSha256 = "sha256-i3CRba2HA7dOEh4PU1rNZUl05pZqIm946lIjP7ZcFEc=";
vendorSha256 = "sha256-Ya+D15eAJ7qgEQoM2LcN2VEmmyp4cuS6/wCOEGdrgA8=";
# This is the released subpackage from upstream repo
subPackages = [ "examples/base" ];

6
pkgs/tools/misc/ikill/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "ikill";
version = "1.5.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "pjmp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-sxFuDHlrEO2/gA9I++yNAISvsF7wFjSMUI+diVM/+EI=";
sha256 = "sha256-hOQBBwxkVnTkAZJi84qArwAo54fMC0zS+IeYMV04kUs=";
};
cargoSha256 = "sha256-dJa+bXJTA2Jju1p29Fyj87N0Pr/l6XRr3QqemhD2BAA=";
cargoSha256 = "sha256-zKa2FP0lBS2XjgPWfyPZ60aHyeAe0uNIFbmuX4Uo1rA=";
meta = with lib; {
description = "Interactively kill running processes";