Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-07-07 06:02:03 +00:00 committed by GitHub
commit 0f7bc289e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 353 additions and 130 deletions

View file

@ -4643,6 +4643,12 @@
githubId = 6874204;
name = "Jason Carr";
};
j-brn = {
email = "me@bricker.io";
github = "j-brn";
githubId = 40566146;
name = "Jonas Braun";
};
j-keck = {
email = "jhyphenkeck@gmail.com";
github = "j-keck";

View file

@ -162,20 +162,20 @@ in {
# TODO currently can't install more than one because `lame` clashes
stage-trial = mkPianoteq rec {
name = "stage-trial";
version = "7.3.0";
version = "7.4.1";
archdir = "x86-64bit";
src = fetchPianoteqTrial {
name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z";
sha256 = "12zbr54ng7cb4ngl1qrf5h0gs8c42d6d3j08492xr14m9x9y132k";
sha256 = "14mbaz6i1rxqayrjjkck9yx8iijkm4q1qz29ymkd7sz2gpk7fcpa";
};
};
standard-trial = mkPianoteq rec {
name = "standard-trial";
version = "7.3.0";
version = "7.4.1";
archdir = "x86-64bit";
src = fetchPianoteqTrial {
name = "pianoteq_linux_trial_v${versionForFile version}.7z";
sha256 = "04sh45hm3y3y6kfj3p32fi6p95r9fc6xf4r5i74laylms4f6gr6d";
sha256 = "01xh4n0h7dd3xqhm0bx0a62mqmfvxvmr5cm5r2g249c9wqg5i32a";
};
};
stage-6 = mkPianoteq rec {

View file

@ -175,11 +175,13 @@
"version": "0.1.0"
},
"cloudflare": {
"owner": "terraform-providers",
"owner": "cloudflare",
"provider-source-address": "registry.terraform.io/cloudflare/cloudflare",
"repo": "terraform-provider-cloudflare",
"rev": "v2.7.0",
"sha256": "1r18lxhfi2sd42ja4bzxbkf5bli8iljrpqbgdcn1a7rcf44vnxa2",
"version": "2.7.0"
"rev": "v2.23.0",
"sha256": "0cyw6lddw3pj5lqra78qn0nd16ffay86vc8sqa68grx7ik9jgn7l",
"vendorSha256": "19fdwif81lqp848jhawd09b0lalslrwadd519vsdw03v2wp4p962",
"version": "2.23.0"
},
"cloudinit": {
"owner": "hashicorp",

View file

@ -21,11 +21,11 @@
stdenv.mkDerivation rec {
pname = "zeek";
version = "4.0.2";
version = "4.0.3";
src = fetchurl {
url = "https://download.zeek.org/zeek-${version}.tar.gz";
sha256 = "15gxxgg7nmfmswlbxhvcp6alq5k9wpvrm5cwyf1qfd7xsfli61sm";
sha256 = "1nrkwaj0dilyzhfl6yma214vyakvpi97acyffdr7n4kdm4m6pvik";
};
nativeBuildInputs = [ cmake flex bison file ];

View file

@ -16,12 +16,12 @@ with lib;
buildGoPackage rec {
pname = "gitea";
version = "1.14.3";
version = "1.14.4";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
sha256 = "sha256-ieQxqZO84sYBcCzWYn40tRGLgSs2PpLlcNkI4vFq+wE=";
sha256 = "sha256-sl/Vml8QmwZEAd2PIYWQcP7s6NYeomGJQGKhRiddtoo=";
};
unpackPhase = ''

View file

@ -6,4 +6,5 @@
obs-multi-rtmp = libsForQt5.callPackage ./obs-multi-rtmp.nix {};
obs-ndi = libsForQt5.callPackage ./obs-ndi.nix {};
wlrobs = callPackage ./wlrobs.nix {};
looking-glass-obs = callPackage ./looking-glass-obs.nix {};
}

View file

@ -0,0 +1,29 @@
{ lib, stdenv, fetchFromGitHub, cmake, libbfd, SDL2, obs-studio
, looking-glass-client }:
stdenv.mkDerivation {
pname = "looking-glass-obs";
version = looking-glass-client.version;
src = looking-glass-client.src;
sourceRoot = "source/obs";
nativeBuildInputs = [ cmake ];
buildInputs = [ obs-studio libbfd SDL2 ];
NIX_CFLAGS_COMPILE = "-mavx";
installPhase = ''
mkdir -p $out/lib/obs-plugins/
mv liblooking-glass-obs.so $out/lib/obs-plugins/
'';
meta = with lib; {
description = "Plugin for OBS Studio for efficient capturing of looking-glass";
homepage = "https://looking-glass.io/docs/stable/obs/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ babbaj ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "canta-theme";
version = "2020-05-17";
version = "2021-07-06";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "0b9ffkw611xxb2wh43sjqla195jp0ygxph5a8dvifkxdw6nxc2y0";
sha256 = "sha256-dz78h9Qq25+/i6fmw/zGlPq3DVQB3ADYwehgaWReMQ8=";
};
nativeBuildInputs = [

View file

@ -2,20 +2,20 @@
rustPlatform.buildRustPackage rec {
pname = "jrsonnet";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "CertainLach";
repo = "jrsonnet";
sha256 = "sha256-+kvdbUw+lQ/BKJwcBzho1OWg/6y0YDRkLE+SAe8hLQQ=";
sha256 = "sha256-vDZpb5Z8XOVc6EJ1Nul07kC8ppqcGzKPb4DEarqq2yg=";
};
postInstall = ''
ln -s $out/bin/jrsonnet $out/bin/jsonnet
'';
cargoSha256 = "sha256-0soXOxp4Kr1DdmVERl8/sqwltqYLDwkVJZHFnYeHs+c=";
cargoSha256 = "sha256-SR3m2meW8mTaxiYgeY/m7HFPrHGVtium/VRU6vWKxys=";
meta = {
description = "Purely-functional configuration language that helps you define JSON data";

View file

@ -47,4 +47,9 @@ in
version = "7.1.3";
sha256 = "08hyv73qp2ndbs0isk8pspsphdzz5qh8czl3wgyxy3mmif9xdg29";
};
fmt_8 = generic {
version = "8.0.1";
sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw";
};
}

View file

@ -1,6 +1,7 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, aiodns
, aiohttp
, flask
, mock
, msrest
, pytest
@ -14,14 +15,14 @@
}:
buildPythonPackage rec {
version = "1.15.0";
version = "1.16.0";
pname = "azure-core";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "197917b98fec661c35392e32abec4f690ac2117371a814e25e57c224ce23cf1f";
sha256 = "b1c7d2e01846074f258c8b2e592239aef836a2b1c27d8d0e8491a2c7e2906ef4";
};
propagatedBuildInputs = [
@ -32,6 +33,7 @@ buildPythonPackage rec {
checkInputs = [
aiodns
aiohttp
flask
mock
msrest
pytest
@ -51,6 +53,8 @@ buildPythonPackage rec {
# wants network
"tests/async_tests/test_streaming_async.py"
"tests/test_streaming.py"
# testserver tests require being in a very specific working directory to make it work
"tests/testserver_tests/"
];
meta = with lib; {

View file

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "azure-keyvault-administration";
version = "4.0.0b1";
version = "4.0.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "1kmf2x3jdmfm9c7ldvajzckkm79gxxvl1l2968lizjwiyjbbsih5";
sha256 = "b05a0372f35921cedb7a231426077745eee9a65881088de6d4d8b73d9709a6cb";
};
propagatedBuildInputs = [

View file

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-keyvault-certificates";
version = "4.2.1";
version = "4.3.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "ea651883ad00d0a9a25b38e51feff7111f6c7099c6fb2597598da5bb21d3451c";
sha256 = "4e0a9bae9fd4c222617fbce6b31f97e2e0622774479de3c387239cbfbb828d87";
};
propagatedBuildInputs = [

View file

@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "azure-keyvault-keys";
version = "4.3.1";
version = "4.4.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "fbf67bca913ebf68b9075ee9d2e2b899dc3c7892cc40abfe1b08220a382f6ed9";
sha256 = "7792ad0d5e63ad9eafa68bdce5de91b3ffcc7ca7a6afdc576785e6a2793caed0";
};
propagatedBuildInputs = [

View file

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "azure-keyvault-secrets";
version = "4.2.0";
version = "4.3.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "1083ab900da5ec63c518ffef49d9fdca02c81ddffdf80c52c03cd9da479e021f";
sha256 = "26279ba3a6c727deba1fb61f549496867baddffbf062bd579d6fd2bc04e95276";
};
propagatedBuildInputs = [

View file

@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
version = "1.0.1";
version = "2.0.0";
pname = "azure-mgmt-appconfiguration";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f";
sha256 = "97e990ec6a5a3acafc7fc1add8ff1a160ebb2052792931352fd7cf1d90f1f956";
extension = "zip";
};

View file

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-containerservice";
version = "15.1.0";
version = "16.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "51c64e01e614c9b88723b86b36b48f8417171610a098bf4690e39e71cefc32d9";
sha256 = "d6aa95951d32fe2cb390b3d8ae4f6459746de51bbaad94b5d1842dd35c4d0c11";
};
propagatedBuildInputs = [

View file

@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
version = "1.2.2";
version = "1.3.0";
pname = "azure-mgmt-core";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "4246810996107f72482a9351cf918d380c257e90942144ec9c0c2abda1d0a312";
sha256 = "3ffb7352b39e5495dccc2d2b47254f4d82747aff4735e8bf3267c335b0c9bb40";
};
propagatedBuildInputs = [

View file

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-cosmosdb";
version = "6.3.0";
version = "6.4.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "4135104da5b0f3f0a7249abcd8da55936603e50aaaf2868e5f739a717cf20b3d";
sha256 = "fb6b8ab80ab97214b94ae9e462ba1c459b68a3af296ffc26317ebd3ff500e00b";
};
propagatedBuildInputs = [

View file

@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
version = "3.0.0";
version = "4.0.0";
pname = "azure-mgmt-netapp";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "5a293118c5089c4ec81f676b76aa95c60408a3443a46131d22978ffb81fe4605";
sha256 = "7195e413a0764684cd42bec9e429c13c290db9ab5c465dbed586a6f6d0ec8a42";
extension = "zip";
};

View file

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-rdbms";
version = "8.1.0";
version = "9.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "b30003a94c306533ebfb741b824dd1cc6c0a1810200926675e6b808bd0459d19";
sha256 = "36a508fe40f904723485586e9088092e6f65cdb82bc86efc42d615499c256829";
};
propagatedBuildInputs = [

View file

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-sql";
version = "2.1.0";
version = "3.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "5474387ec3417b0a277de2b42c6d1992256a6a9717ca1ada0e8dad01238b9919";
sha256 = "e2fe427ed8f6e368de7176696b38910a16b307dd9c2e1d2144d643a1c0f38e21";
};
propagatedBuildInputs = [

View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "bitarray";
version = "2.1.3";
version = "2.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "a24aff72a7f1b09571b5daf9dbfcffd98481be1fe085ae5ef662cf11452a97e0";
sha256 = "sha256-xF7u+qYA9vL2hD/EaZhprl18HouPtY/zgFhM6bx6cII=";
};
checkPhase = ''

View file

@ -1,6 +1,10 @@
{ lib, fetchPypi, buildPythonPackage, pythonOlder
{ lib
, fetchPypi
, fetchpatch
, buildPythonPackage
, flake8
, flake8-polyfill
, importlib-metadata
, python
}:
buildPythonPackage rec {
@ -12,10 +16,27 @@ buildPythonPackage rec {
sha256 = "0937rnk3c2z1jkdmbw9hfm80p5k467q7rqhn6slfiprs4kflgpd1";
};
patches = [
(fetchpatch {
# Fix tests by setting extended-default-ignore to an empty list
url = "https://github.com/PyCQA/pep8-naming/commit/6d62db81d7967e123e29673a4796fefec6f06d26.patch";
sha256 = "1jpr2dga8sphksik3izyzq9hiszyki691mwnh2rjzd2vpgnv8cxf";
})
];
propagatedBuildInputs = [
flake8
flake8-polyfill
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
checkPhase = ''
runHook preCheck
${python.interpreter} run_tests.py
runHook postCheck
'';
pythonImportsCheck = [
"pep8ext_naming"
];
meta = with lib; {

View file

@ -1,46 +1,50 @@
{ lib, buildPythonPackage, fetchFromGitHub
, future, six, ecdsa, rsa
, pycrypto, pytestcov, pytestrunner, cryptography
{ lib
, buildPythonPackage
, fetchFromGitHub
, ecdsa
, rsa
, pycrypto
, pyasn1
, pycryptodome
, cryptography
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "python-jose";
version = "3.2.0";
version = "3.3.0";
src = fetchFromGitHub {
owner = "mpdavis";
repo = "python-jose";
repo = pname;
rev = version;
sha256 = "cSPIZrps0xFd4pPcQ4w/jFWOk2XYgd3mtE/sDzlytvY=";
sha256 = "sha256-6VGC6M5oyGCOiXcYp6mpyhL+JlcYZKIqOQU9Sm/TkKM=";
};
checkInputs = [
propagatedBuildInputs = [
cryptography
ecdsa
pyasn1
pycrypto
pytestCheckHook
pytestcov
pytestrunner
cryptography # optional dependency, but needed in tests
pycryptodome
rsa
];
# relax ecdsa deps
patchPhase = ''
checkInputs = [
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.py \
--replace 'ecdsa<0.15' 'ecdsa' \
--replace 'ecdsa <0.15' 'ecdsa'
--replace '"pytest-runner",' ""
'';
disabledTests = [
# https://github.com/mpdavis/python-jose/issues/176
"test_key_too_short"
];
propagatedBuildInputs = [ future six ecdsa rsa ];
pythonImportsCheck = [ "jose" ];
meta = with lib; {
homepage = "https://github.com/mpdavis/python-jose";
description = "A JOSE implementation in Python";
license = licenses.mit;
maintainers = [ maintainers.jhhuh ];
maintainers = with maintainers; [ jhhuh ];
};
}

View file

@ -1,4 +1,4 @@
{ lib, fetchurl, fetchFromGitHub, buildPythonPackage, isPy3k,
{ lib, fetchpatch, fetchFromGitHub, buildPythonPackage, isPy3k,
isodate, lxml, xmlsec, freezegun }:
buildPythonPackage rec {
@ -13,14 +13,21 @@ buildPythonPackage rec {
sha256 = "1yk02xq90bm7p6k091av6gapb5h2ccxzgrbm03sj2x8h0wff9s8k";
};
# Remove both patches on update
patches = [
# Remove the dependency on defusedxml
#
# This patch is already merged upstream and does not introduce any
# functionality changes.
(fetchurl {
(fetchpatch {
url = "https://github.com/onelogin/python3-saml/commit/4b6c4b1f2ed3f6eab70ff4391e595b808ace168c.patch";
sha256 = "11gqn7ib2hmlx5wp4xhi375v5ajapwmj4lpw0y44bh5ww8cypvqy";
sha256 = "sha256-KHyAoX3our3Rz2z4xo0lTBB1XOGuC3Pe+lUDCzK5WQI=";
})
# Update expiry dates for test response XMLs
(fetchpatch {
url = "https://github.com/onelogin/python3-saml/commit/05611bbf6d7d8313adb9c77ff88a9210333ccc38.patch";
sha256 = "sha256-62TwgCXDFYsZIAeqAysJRziMvhUVhGzta/C2wS3v4HY=";
})
];

View file

@ -1,9 +1,8 @@
# This is a temporary copy of the default.nix in this folder, with the version updated to the current tip of rr's master branch.
# This exists because rr has not had a release in a long time, but there have been a lot of improvements including UX.
# Some of the UX improvements help prevent foot shooting.
# Upstream has stated that it should be fine to use master.
# This file, and its attribute in all-packages, can be removed once rr makes a release.
# For further information, please see https://github.com/NixOS/nixpkgs/issues/99535 "Improve support for the rr debugger in nixos containers"
# This is a temporary copy of the default.nix in this folder, with the version
# updated to the current tip of rr's master branch. This exists because rr has
# not had a release in a long time. Upstream has stated that it should be fine
# to use master. This file, and its attribute in all-packages, can be removed
# once rr makes a release.
{ callPackage, fetchFromGitHub }:
@ -12,12 +11,12 @@ let
in
rr.overrideAttrs (old: {
version = "unstable-2020-10-04";
version = "unstable-2021-07-06";
src = fetchFromGitHub {
owner = "mozilla";
repo = "rr";
rev = "9ff375813a740a0a6ebcdfcebc58bd61ab68c667";
sha256 = "0raifs6cg5ckpi2445inhy3hfhp4p89s1lkx9z17mcc2g1c1phf5";
rev = "0fc21a8d654dabc7fb1991d76343824cb7951ea0";
sha256 = "0s851rflxmvxcfw97zmplcwzhv86xmd3my78pi4c7gkj18d621i5";
};
})

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
version = "0.12.12";
version = "0.12.14";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
sha256 = "sha256-4Ooadv8r6GUBiayiv4WKVurUeRPIv6LPlMhieH4VL8o=";
sha256 = "sha256-+qFR5XGV1LSCY8AR7gd269UcOwlL5hkvKiQEhdsqIJc=";
};
vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";

View file

@ -1,7 +1,7 @@
{ lib, buildEnv, callPackage, makeWrapper, Cocoa }:
buildEnv {
name = "flare-1.11";
name = "flare-1.12rc1";
paths = [
(callPackage ./engine.nix { inherit Cocoa; })

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flare-engine";
version = "1.11";
version = "1.12rc1";
src = fetchFromGitHub {
owner = "flareteam";
repo = pname;
rev = "v${version}";
sha256 = "1j6raymz128miq517h9drks4gj79dajw3lsr0msqxz0z3zm6cc4n";
sha256 = "0bl5vayf87y2jd6b1w4nn7pbrhix6dj86xv5kzqxz6b2y65lq73p";
};
nativeBuildInputs = [ cmake ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flare-game";
version = "1.11";
version = "1.12rc1";
src = fetchFromGitHub {
owner = "flareteam";
repo = pname;
rev = "v${version}";
sha256 = "18m2qfbbaqklm20gnr7wzrwbmylp1jh781a4p1dq0hymqcg92x5l";
sha256 = "1i2fa2hds5ph8gf5b9647vrn7ycz2fl9xaaaybz8yrjmnpx27bzc";
};
nativeBuildInputs = [ cmake ];

View file

@ -1326,6 +1326,18 @@ final: prev:
meta.homepage = "https://github.com/direnv/direnv.vim/";
};
doki-theme-vim = buildVimPluginFrom2Nix {
pname = "doki-theme-vim";
version = "2021-06-16";
src = fetchFromGitHub {
owner = "doki-theme";
repo = "doki-theme-vim";
rev = "8a3a7b64d5509f87564d846faae5ef0b2b77d2a6";
sha256 = "05s7fph5bm9gz2b0biqrpsvvh8ccfxh5csxya3rkja86ppz6wawr";
};
meta.homepage = "https://github.com/doki-theme/doki-theme-vim/";
};
DoxygenToolkit-vim = buildVimPluginFrom2Nix {
pname = "DoxygenToolkit-vim";
version = "2010-11-06";

View file

@ -102,6 +102,7 @@ digitaltoad/vim-pug
direnv/direnv.vim
dleonard0/pony-vim-syntax
dmix/elvish.vim
doki-theme/doki-theme-vim
dominikduda/vim_current_word
dpelle/vim-LanguageTool
dracula/vim as dracula-vim

View file

@ -2,15 +2,28 @@
stdenv.mkDerivation rec {
pname = "evdi";
version = "unstable-20210401";
version = "unstable-2021-06-11";
src = fetchFromGitHub {
owner = "DisplayLink";
repo = pname;
rev = "b0b3d131b26df62664ca33775679eea7b70c47b1";
sha256 = "09apbvdc78bbqzja9z3b1wrwmqkv3k7cn3lll5gsskxjnqbhxk9y";
rev = "65e12fca334f2f42396f4e8d16592d53cab34dd6";
sha256 = "sha256-81IfdYKadKT7vRdkmxzfGo4KHa4UJ8uJ0K6djQCr22U=";
};
# Linux 5.13 support
# The patches break compilation for older kernels
patches = lib.optional (kernel.kernelAtLeast "5.13") [
(fetchpatch {
url = "https://github.com/DisplayLink/evdi/commit/c5f5441d0a115d2cfc8125b8bafaa05b2edc7938.patch";
sha256 = "sha256-tWYgBrRh3mXPebhUygOvJ07V87g9JU66hREriACfEVI=";
})
(fetchpatch {
url = "https://github.com/DisplayLink/evdi/commit/5f04d2e2df4cfd21dc15d31f1152c6a66fa48a78.patch";
sha256 = "sha256-690/eUiEVWvnT/YAVgKcLo86dgolF9giWRuPxXpL+eQ=";
})
];
nativeBuildInputs = kernel.moduleBuildDependencies;
buildInputs = [ kernel libdrm ];
@ -31,8 +44,8 @@ stdenv.mkDerivation rec {
description = "Extensible Virtual Display Interface";
maintainers = with maintainers; [ eyjhb ];
platforms = platforms.linux;
license = with licenses; [ lgpl21 gpl2 ];
license = with licenses; [ lgpl21Only gpl2Only ];
homepage = "https://www.displaylink.com/";
broken = versionOlder kernel.version "4.19" || stdenv.isAarch64;
broken = kernel.kernelOlder "4.19" || stdenv.isAarch64;
};
}

View file

@ -0,0 +1,25 @@
{ stdenvNoCC, lib, linuxPackages }:
stdenvNoCC.mkDerivation {
pname = "rtw89-firmware";
inherit (linuxPackages.rtw89) version src;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/lib/firmware/rtw89
cp *.bin $out/lib/firmware/rtw89
runHook postInstall
'';
meta = with lib; {
description = "Driver for Realtek 8852AE, an 802.11ax device";
homepage = "https://github.com/lwfinger/rtw89";
license = licenses.unfreeRedistributableFirmware;
maintainers = with maintainers; [ tvorog ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,32 @@
{ lib, stdenv, fetchFromGitHub, kernel, kmod, looking-glass-client }:
stdenv.mkDerivation rec {
pname = "kvmfr";
version = looking-glass-client.version;
src = looking-glass-client.src;
sourceRoot = "source/module";
hardeningDisable = [ "pic" "format" ];
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = [
"KVER=${kernel.modDirVersion}"
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
installPhase = ''
install -D kvmfr.ko -t "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/misc/"
'';
meta = with lib; {
description = "Optional kernel module for LookingGlass";
longDescription = ''
This kernel module implements a basic interface to the IVSHMEM device for LookingGlass when using LookingGlass in VM->VM mode
Additionally, in VM->host mode, it can be used to generate a shared memory device on the host machine that supports dmabuf
'';
homepage = "https://github.com/gnif/LookingGlass";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ j-brn ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -0,0 +1,40 @@
{ stdenv, lib, fetchFromGitHub, kernel }:
let
modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtw89";
in
stdenv.mkDerivation {
pname = "rtw89";
version = "unstable-2021-07-03";
src = fetchFromGitHub {
owner = "lwfinger";
repo = "rtw89";
rev = "cebafc6dc839e66c725b92c0fabf131bc908f607";
sha256 = "1vw67a423gajpzd5d51bxnja1qpppx9x5ii2vcfkj6cbnqwr83af";
};
makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
mkdir -p ${modDestDir}
find . -name '*.ko' -exec cp --parents {} ${modDestDir} \;
find ${modDestDir} -name '*.ko' -exec xz -f {} \;
runHook postInstall
'';
meta = with lib; {
description = " Driver for Realtek 8852AE, an 802.11ax device";
homepage = "https://github.com/lwfinger/rtw89";
license = with licenses; [ gpl2Only ];
maintainers = with maintainers; [ tvorog ];
platforms = platforms.linux;
broken = kernel.kernelOlder "5.4";
priority = -1;
};
}

View file

@ -24,6 +24,11 @@ let
sha256 = "0viiwimnk26jfi4ypkvclqqxw8anlmch10zscjw69d8x1pyqczcd";
};
aarch64-darwin = {
url = "${baseUrl}/${name}-darwin-arm.tar.gz";
sha256 = "sha256-EZbJgMzEZScvaqSKay5aDuayVaIK1zZUzqAHgT0czZk=";
};
x86_64-linux = {
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
sha256 = "11113l8pyhq6vbsh79m5anh6ljss94zhnp33ghds9rn1gxa83hnb";
@ -109,6 +114,6 @@ in stdenv.mkDerivation rec {
license = licenses.free;
homepage = "https://cloud.google.com/sdk/";
maintainers = with maintainers; [ iammrinal0 pradyuman stephenmw zimbatm ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
};
}

View file

@ -1,20 +1,20 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
version = "3.5.1";
version = "3.6.0";
pulumiPkgs = {
x86_64-linux = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.5.1-linux-x64.tar.gz";
sha256 = "1wdkwifn1p0m98dmn0g2kcwnllqilfwzkyyg2sg1pfdmk3da9bi3";
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.6.0-linux-x64.tar.gz";
sha256 = "1phj65y1l6pllq5fyrxm7hrwg44jpzq1skq6dw7x6zrs8prnlj52";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-amd64.tar.gz";
sha256 = "0d88xfi7zzmpyrnvakwxsyavdx6d5hmfrcf4jhmd53mni0m0551l";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.8.0-linux-amd64.tar.gz";
sha256 = "14r2akgfrs512h9g6lx9scl0bph3qmw3j113shwg2nhqbmwvvh3z";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.10.0-linux-amd64.tar.gz";
sha256 = "12fj43pcs64s0i6h05q94abbxi0r1rlh8qgycmmydr8wajsn2a54";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.2.0-linux-amd64.tar.gz";
@ -41,8 +41,8 @@
sha256 = "0yhdcjscdkvvai95z2v6xabvvsfvaqi38ngpqrb73ahlwqhz3nys";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.9.0-linux-amd64.tar.gz";
sha256 = "0w28ikwna057dbhsvidkd5sp2v0frih6n4an1cl3gx51yhqsxzap";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.11.0-linux-amd64.tar.gz";
sha256 = "0h0dpbdc9rcagw0wgz5l6jjc8wl1hj5ki5shi44jyf4hz7l0yl9y";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.2.0-linux-amd64.tar.gz";
@ -53,16 +53,16 @@
sha256 = "13rchk54wpjwci26kfa519gqagwfrp31w6a9nk1xfdxj45ha9d3x";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.0.1-linux-amd64.tar.gz";
sha256 = "1jk3al4mnk6cblaf56yyx0anv3kp3vyr6fqglsinkzaayaswx63z";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.1.0-linux-amd64.tar.gz";
sha256 = "0al3578g7l9rvhkswlm56wpkybj6njj39a3g56in9882lhpqixsy";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.4.0-linux-amd64.tar.gz";
sha256 = "1dpd6m5w6fnxrspig4s2vcd4hxy720gcrdrxakn1mvz29k4s0zv3";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.5.0-linux-amd64.tar.gz";
sha256 = "1zi6r1g7l56ra506hxkj8p9wlkgbmry7ir48v8wwdsfvplryj4sf";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.1.0-linux-amd64.tar.gz";
sha256 = "0q1bi1a80jwgx52m9hy0vp67hdv3nbhd0gqxj3jaf5w4dnh48dca";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.2.0-linux-amd64.tar.gz";
sha256 = "1lvb3vs2yp0ybz2xn2za5f0nfipiisrpzwzfn0wgl9arh17v0phc";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-linux-amd64.tar.gz";
@ -99,16 +99,16 @@
];
x86_64-darwin = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.5.1-darwin-x64.tar.gz";
sha256 = "0q2617vg53ib65vlj09z78lqqg4dz5ymcjn9kablkm5a6s1sfh5s";
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.6.0-darwin-x64.tar.gz";
sha256 = "0yql94y78q0hfsxfsgvkxs7dv2lgrkv4ypm59qjr8l04krcknbmm";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-amd64.tar.gz";
sha256 = "12mkr0xczdnp21k0k7qn4r3swkaq3pr6v2z853p1db7ksz5kds23";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.8.0-darwin-amd64.tar.gz";
sha256 = "0qhpzvfv67fn2n1x3h7znqiw7wxz526iw1a41q8v8jalkahfa2rb";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.10.0-darwin-amd64.tar.gz";
sha256 = "0zv4b7nyvz7h0h0jxndd7dxzf4risgqyl7f20cbbcsixxk90sz38";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.2.0-darwin-amd64.tar.gz";
@ -135,8 +135,8 @@
sha256 = "1dpsbq3b0fz86355jy7rz4kcsa1lnw4azn25vzlis89ay1ncbblc";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.9.0-darwin-amd64.tar.gz";
sha256 = "1y4pjx260dlh7yi0skd5n2ixlqzi6b9lp5h77qaq1b9h3n4xybfh";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.11.0-darwin-amd64.tar.gz";
sha256 = "1k7yxajx3157qdanw1y11053k74rwlcvh828xrpwkzqszmzizxp9";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.2.0-darwin-amd64.tar.gz";
@ -147,16 +147,16 @@
sha256 = "0qbw4b5zm6dmwdilaz4bjdg55gc5lilwagrxwrab37vq4a8and4c";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.0.1-darwin-amd64.tar.gz";
sha256 = "1ddkzwwr2vc0sp1q3r510rpjqj5dl1dn8ax938874jnflcbcwng6";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.1.0-darwin-amd64.tar.gz";
sha256 = "1fgh7q7sivip212q2zgvrgg3lwxrzasm9vpa858168fvjv67ylbc";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.4.0-darwin-amd64.tar.gz";
sha256 = "1x6fqa643n731cadb02288kc2z321gjjldkvi8wvjjy2dm0lfp72";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.5.0-darwin-amd64.tar.gz";
sha256 = "0cl8wg5g78c147pqy5q52qq9bd7hw8zgvfmdafszwzwz6xh1051b";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.1.0-darwin-amd64.tar.gz";
sha256 = "13rq01ylrqp48n62cp640a4mdqbrqnibb0xaw9pcpddl3a3nnck0";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.2.0-darwin-amd64.tar.gz";
sha256 = "008jqnrl08g3gd38vg2yjwxdn288z75sbp3ghl2cbncfah2lwwja";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-darwin-amd64.tar.gz";

View file

@ -3,25 +3,25 @@
# Version of Pulumi from
# https://www.pulumi.com/docs/get-started/install/versions/
VERSION="3.5.1"
VERSION="3.6.0"
# Grab latest release ${VERSION} from
# https://github.com/pulumi/pulumi-${NAME}/releases
plugins=(
"auth0=2.2.0"
"aws=4.8.0"
"aws=4.10.0"
"cloudflare=3.2.0"
"consul=3.2.0"
"datadog=3.3.0"
"digitalocean=4.4.1"
"docker=3.0.0"
"equinix-metal=2.0.0"
"gcp=5.9.0"
"gcp=5.11.0"
"github=4.2.0"
"gitlab=4.1.0"
"hcloud=1.0.1"
"kubernetes=3.4.0"
"linode=3.1.0"
"hcloud=1.1.0"
"kubernetes=3.5.0"
"linode=3.2.0"
"mailgun=3.1.0"
"mysql=3.0.0"
"openstack=3.2.0"

View file

@ -1,6 +1,7 @@
{ lib
, fetchFromGitHub
, python3
, fetchpatch
, ffmpeg
}:
@ -15,6 +16,16 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "1jpd5zhqg2m9vjjjw4mgzb594q1v1pq1yl65py6kw42bq9w5yl5p";
};
patches = [
# Fixes https://github.com/deepjyoti30/ytmdl/issues/188
# Only needed until the next major release after 2021.06.26
(fetchpatch {
url = "https://github.com/deepjyoti30/ytmdl/commit/37ba821d9692249c1fa563505cf60bd11b8e209e.patch";
includes = [ "bin/ytmdl" ];
sha256 = "sha256-VqtthpUL0Oub3DK7tSvAnemOzPPTcLvXXeebZIGOgdc=";
})
];
postPatch = ''
substituteInPlace setup.py \
--replace "bs4" "beautifulsoup4"

View file

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests
{ stdenv, lib, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests
, makeWrapper
, gawk
, glibc
@ -26,7 +26,7 @@ buildGoPackage rec {
postInstall = ''
echo "complete -C $out/bin/vault vault" > vault.bash
installShellCompletion vault.bash
'' + lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/vault \
--prefix PATH ${lib.makeBinPath [ gawk glibc ]}
'';

View file

@ -40,10 +40,10 @@ in stdenv.mkDerivation {
mkdir -p $out/bin $out/share/bash-completion/completions
mv vault $out/bin
echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
'' + lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/vault \
--prefix PATH ${lib.makeBinPath [ gawk glibc ]}
'' + ''
runHook postInstall
'';

View file

@ -15050,7 +15050,7 @@ in
flyway = callPackage ../development/tools/flyway { };
inherit (callPackages ../development/libraries/fmt { }) fmt_7;
inherit (callPackages ../development/libraries/fmt { }) fmt_7 fmt_8;
fmt = fmt_7;
@ -20996,6 +20996,8 @@ in
rtw88 = callPackage ../os-specific/linux/rtw88 { };
rtlwifi_new = rtw88;
rtw89 = callPackage ../os-specific/linux/rtw89 { };
openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { };
openafs_1_9 = callPackage ../servers/openafs/1.9/module.nix { };
# Current stable release; don't backport release updates!
@ -21007,6 +21009,8 @@ in
jool = callPackage ../os-specific/linux/jool { };
kvmfr = callPackage ../os-specific/linux/kvmfr { };
mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { };
mwprocapture = callPackage ../os-specific/linux/mwprocapture { };
@ -21592,6 +21596,8 @@ in
rtw88-firmware = callPackage ../os-specific/linux/firmware/rtw88-firmware { };
rtw89-firmware = callPackage ../os-specific/linux/firmware/rtw89-firmware { };
s3ql = callPackage ../tools/backup/s3ql { };
sass = callPackage ../development/tools/sass { };