mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
31d821c969
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, fribidi, rlwrap, gawk, groff, ncurses }:
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, fribidi, rlwrap, gawk, groff, ncurses, hexdump }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "translate-shell";
|
||||
|
|
@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
|
|||
rlwrap
|
||||
groff
|
||||
fribidi
|
||||
hexdump
|
||||
]}
|
||||
'';
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -52,21 +52,21 @@ rec {
|
|||
|
||||
mkKops = generic;
|
||||
|
||||
kops_1_19 = mkKops rec {
|
||||
version = "1.19.2";
|
||||
sha256 = "15csxih1xy8myky37n5dyzp5mc31pc4bq9asaw6zz51mgw8ad5r9";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
kops_1_20 = mkKops rec {
|
||||
version = "1.20.2";
|
||||
sha256 = "011ib3xkj6nn7qax8d0ns8y4jhkwwmry1qnzxklvzssaxhmzs557";
|
||||
version = "1.20.3";
|
||||
sha256 = "sha256-Yrh0wFz7MQgTDwENqQouYh3pr1gOq64Rqft5yxIiCAo=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
kops_1_21 = mkKops rec {
|
||||
version = "1.21.1";
|
||||
sha256 = "sha256-/C/fllgfAovHuyGRY+LM09bsUpYdA8zDw1w0b9HnlBc=";
|
||||
version = "1.21.4";
|
||||
sha256 = "sha256-f2xOVa3N/GH5IoI6H/QwDdKTeQoF/kEHX6lNytCZ9cs=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
kops_1_22 = mkKops rec {
|
||||
version = "1.22.2";
|
||||
sha256 = "sha256-9LT4/iwlPFiz+hUHE0y8DK8T9xwL9HkrrFUXrEqKbM8=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
, openssl
|
||||
, zlib
|
||||
, libuv
|
||||
# External poll is required for e.g. mosquitto, but discouraged by the maintainer.
|
||||
, withExternalPoll ? false
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -29,7 +31,8 @@ let
|
|||
"-DLWS_WITH_SOCKS5=ON"
|
||||
# Required since v4.2.0
|
||||
"-DLWS_BUILD_HASH=no_hash"
|
||||
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON";
|
||||
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON"
|
||||
++ lib.optional withExternalPoll "-DLWS_WITH_EXTERNAL_POLL=ON";
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable";
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ nasm ];
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"ARCH=${stdenv.hostPlatform.linuxArch}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A codec library which supports H.264 encoding and decoding";
|
||||
|
|
|
|||
|
|
@ -24,6 +24,16 @@
|
|||
, orc
|
||||
}:
|
||||
|
||||
let
|
||||
# This file was mistakenly not included with the 0.15.0 release tarball.
|
||||
# Should be fixed with the next release.
|
||||
# https://gitlab.freedesktop.org/spice/spice/-/issues/56
|
||||
doxygen_sh = fetchurl {
|
||||
url = "https://gitlab.freedesktop.org/spice/spice/-/raw/v0.15.0/doxygen.sh";
|
||||
sha256 = "0g4bx91qclihp1jfhdhyj7wp4hf4289794xxbw32kk58lnd7bzkg";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spice";
|
||||
version = "0.15.0";
|
||||
|
|
@ -34,10 +44,10 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
postPatch = ''
|
||||
install ${doxygen_sh} doxygen.sh
|
||||
patchShebangs build-aux
|
||||
'';
|
||||
|
||||
|
||||
nativeBuildInputs = [
|
||||
glib
|
||||
meson
|
||||
|
|
@ -74,7 +84,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
mesonFlags = [
|
||||
"-Dgstreamer=1.0"
|
||||
"-Dcelt051=disabled"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "discord.py";
|
||||
version = "1.7.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -30,6 +32,8 @@ buildPythonPackage rec {
|
|||
patchPhase = ''
|
||||
substituteInPlace "discord/opus.py" \
|
||||
--replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'"
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "aiohttp>=3.6.0,<3.8.0" "aiohttp>=3.6.0,<4"
|
||||
'';
|
||||
|
||||
# Only have integration tests with discord
|
||||
|
|
@ -49,7 +53,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python wrapper for the Discord API";
|
||||
homepage = "https://discordpy.rtfd.org/";
|
||||
maintainers = [ maintainers.ivar ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ivar ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "imap-tools";
|
||||
version = "0.50.0";
|
||||
version = "0.50.1";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
owner = "ikvk";
|
||||
repo = "imap_tools";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4OMWLWvNRg7z4KAAkB1l5YaWILFwIepZOWhBd64SGWI=";
|
||||
hash = "sha256-d9caVmXV/yynimXYZNspGar4BXXXec/d8kw2DDEgvpY=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -1,26 +1,35 @@
|
|||
{ buildPythonPackage, lib, fetchPypi, numpy
|
||||
, pydantic, pint, networkx, pytest-runner, pytest-cov, pytest
|
||||
{ buildPythonPackage, lib, fetchPypi
|
||||
, networkx
|
||||
, numpy
|
||||
, pint
|
||||
, pydantic
|
||||
, pytestCheckHook
|
||||
} :
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qcelemental";
|
||||
version = "0.23.0";
|
||||
|
||||
checkInputs = [ pytest-runner pytest-cov pytest ];
|
||||
propagatedBuildInputs = [ numpy pydantic pint networkx ];
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "642bc86ce937621ddfb1291cbff0851be16b26feb5eec562296999e36181cee3";
|
||||
sha256 = "sha256-XcsR89tu26EG5AcXqmndkESLGWZ8eKmTkjaLziosawE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
pydantic
|
||||
pint
|
||||
networkx
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Periodic table, physical constants, and molecule parsing for quantum chemistry";
|
||||
homepage = "http://docs.qcarchive.molssi.org/projects/qcelemental/en/latest/";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.sheepforce ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,28 +1,31 @@
|
|||
{ buildPythonPackage, lib, fetchPypi, pyyaml, qcelemental, pydantic
|
||||
, py-cpuinfo, psutil, pytest-runner, pytest, pytest-cov
|
||||
} :
|
||||
{ buildPythonPackage
|
||||
, lib
|
||||
, fetchPypi
|
||||
, psutil
|
||||
, py-cpuinfo
|
||||
, pydantic
|
||||
, pyyaml
|
||||
, qcelemental
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qcengine";
|
||||
version = "0.20.1";
|
||||
version = "0.21.0";
|
||||
|
||||
checkInputs = [
|
||||
pytest-runner
|
||||
pytest-cov
|
||||
pytest
|
||||
];
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
psutil
|
||||
py-cpuinfo
|
||||
pydantic
|
||||
pyyaml
|
||||
qcelemental
|
||||
pydantic
|
||||
py-cpuinfo
|
||||
psutil
|
||||
];
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "hZxE7b0bOx/B8Kz4cgBC7wV23OikRxwrdZ4UQ8G/yhg=";
|
||||
sha256 = "sha256-ZsPKvbaZ7BBZuOmzq12ism/HyWYcLlQHgZaTzmIsMq4=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ buildPythonPackage rec {
|
|||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ goibhniu ];
|
||||
# error: use of undeclared identifier 'kFSEventStreamEventFlagItemCloned'
|
||||
broken = stdenv.isDarwin;
|
||||
# builds fine on aarch64-darwin
|
||||
broken = stdenv.isDarwin && !stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "corrosion";
|
||||
version = "unstable-2021-02-23";
|
||||
version = "unstable-2021-11-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AndrewGaspar";
|
||||
repo = "corrosion";
|
||||
rev = "e6c35c7e55a59c8223577b5abc4d253b4a82898b";
|
||||
sha256 = "0vq6g3ggnqiln0q8gsr8rr5rrdgpfcgfly79jwcygxrviw37m44d";
|
||||
rev = "f679545a63a8b214a415e086f910126ab66714fa";
|
||||
sha256 = "sha256-K+QdhWc5n5mH6yxiQa/v5HsrqnWJ5SM93IprVpyCVO0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
inherit src;
|
||||
sourceRoot = "${src.name}/${cargoRoot}";
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "1fsq8zzzq28fj2fh92wmg8kmdj4y10mcpdmlgxsygy5lbh4xs13f";
|
||||
sha256 = "sha256-ZvCRgXv+ASMIL00oc3luegV1qVNDieU9J7mbIhfayGk=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
|
|
|||
|
|
@ -1,17 +1,7 @@
|
|||
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
|
||||
|
||||
let
|
||||
version = "14.4.0";
|
||||
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
|
||||
docker_x86_64 = fetchurl {
|
||||
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.x86_64";
|
||||
sha256 = "0cd0bcqfy2cwkhgj1d4mmn0xv4n5mmhyf2yv42ynvv0yr5xk75n0";
|
||||
};
|
||||
|
||||
docker_arm = fetchurl {
|
||||
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.arm";
|
||||
sha256 = "06dnxj1w1nnqkkxrbhz8p85g1afr49j8jizkf2g8j01dsk5b2gvi";
|
||||
};
|
||||
version = "14.5.0";
|
||||
in
|
||||
buildGoPackage rec {
|
||||
inherit version;
|
||||
|
|
@ -29,17 +19,11 @@ buildGoPackage rec {
|
|||
owner = "gitlab-org";
|
||||
repo = "gitlab-runner";
|
||||
rev = "v${version}";
|
||||
sha256 = "07dvbair8fiska7ay4k4hbdwlkgyrq8hmxxwdzkhcpyc0faxqlly";
|
||||
sha256 = "sha256-BxnIrjiEW61J6hl7mWNXc2Vb4ae1cWqOypTy9Xo7Hkc=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-shell-path.patch ];
|
||||
|
||||
postInstall = ''
|
||||
install -d $out/bin/helper-images
|
||||
ln -sf ${docker_x86_64} $out/bin/helper-images/prebuilt-x86_64.tar.xz
|
||||
ln -sf ${docker_arm} $out/bin/helper-images/prebuilt-arm.tar.xz
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "GitLab Runner the continuous integration executor of GitLab";
|
||||
license = licenses.mit;
|
||||
|
|
|
|||
|
|
@ -8,13 +8,19 @@
|
|||
, cjson
|
||||
, libuuid
|
||||
, libuv
|
||||
, libwebsockets_3_1
|
||||
, libwebsockets
|
||||
, openssl
|
||||
, withSystemd ? stdenv.isLinux
|
||||
, systemd
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
let
|
||||
# Mosquitto needs external poll enabled in libwebsockets.
|
||||
libwebsockets' = libwebsockets.override {
|
||||
withExternalPoll = true;
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mosquitto";
|
||||
version = "2.0.12";
|
||||
|
|
@ -54,7 +60,7 @@ stdenv.mkDerivation rec {
|
|||
cjson
|
||||
libuuid
|
||||
libuv
|
||||
libwebsockets_3_1
|
||||
libwebsockets'
|
||||
openssl
|
||||
] ++ lib.optional withSystemd systemd;
|
||||
|
||||
|
|
|
|||
|
|
@ -51,8 +51,8 @@ in
|
|||
sha256 = "1zk83hfxgjq1d0n4zx86q3f05y9f2zc6a1miz1zcvfa052q4bljx";
|
||||
};
|
||||
varnish70 = (common {
|
||||
version = "7.0.0";
|
||||
sha256 = "11z0pa618lh925ih67wmp1gqk7i46l486j4spjy71g1n3w5mqylc";
|
||||
version = "7.0.1";
|
||||
sha256 = "0q265fzarz5530g8lasvfpgks8z1kq1yh7rn88bn2qfly3pmpry4";
|
||||
}).overrideAttrs (oA: {
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
|
|
|
|||
22
pkgs/tools/system/htop/htop-vim.nix
Normal file
22
pkgs/tools/system/htop/htop-vim.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, htop, fetchFromGitHub }:
|
||||
|
||||
htop.overrideAttrs (oldAttrs: rec {
|
||||
pname = "htop-vim";
|
||||
version = "unstable-2021-10-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KoffeinFlummi";
|
||||
repo = pname;
|
||||
rev = "ba6fd3891e9af60b41bd092524cc05f2469fec4b";
|
||||
sha256 = "sha256-G83+5GgEz41begDkdK8zNx48UleufFCJ9pOQ9nbtFNs=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "An interactive process viewer for Linux, with vim-style keybindings";
|
||||
homepage = "https://github.com/KoffeinFlummi/htop-vim";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ thiagokokada ];
|
||||
mainProgram = "htop";
|
||||
};
|
||||
})
|
||||
|
|
@ -22017,6 +22017,8 @@ with pkgs;
|
|||
inherit (darwin) IOKit;
|
||||
};
|
||||
|
||||
htop-vim = callPackage ../tools/system/htop/htop-vim.nix { };
|
||||
|
||||
btop = callPackage ../tools/system/btop {
|
||||
stdenv = gcc11Stdenv;
|
||||
};
|
||||
|
|
@ -32375,11 +32377,11 @@ with pkgs;
|
|||
# Exceptions are versions that we need to keep to allow upgrades from older NixOS releases
|
||||
inherit (callPackage ../applications/networking/cluster/kops {})
|
||||
mkKops
|
||||
kops_1_19
|
||||
kops_1_20
|
||||
kops_1_21
|
||||
kops_1_22
|
||||
;
|
||||
kops = kops_1_21;
|
||||
kops = kops_1_22;
|
||||
|
||||
lguf-brightness = callPackage ../misc/lguf-brightness { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue