MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-10-09 00:02:05 +00:00 committed by GitHub
commit 7a3a25044d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
41 changed files with 143 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/networking/browsers/chromium/upstream-info.json
View file

@ -1,8 +1,8 @@
{
"stable": {
"version": "94.0.4606.71",
"sha256": "0nywwcdjda1b1swfslks8i28qq6jx9gyw50bhl8c2plcc0pbmfya",
"sha256bin64": "1ffa9hqs7ibch0by574l01lwhi5a1mhcyy1qrlr81ssq4pyygrq4",
"version": "94.0.4606.81",
"sha256": "16755mfqxxmvslm9ix060safrnml91ckj5p85960jj5g5hmslwbh",
"sha256bin64": "1d3z5np6b6jax7afak7f0yh76kmmdggdjlrzwyhy8hgrv7c7rsdz",
"deps": {
"gn": {
"version": "2021-08-11",
@ -18,9 +18,9 @@
}
},
"beta": {
"version": "95.0.4638.32",
"sha256": "1w904axixagn6gqcb90849q3qy0k3c6lgl0c97cb6m78l9xrrnbr",
"sha256bin64": "1z7xx608sh8agdl98r7xk7s43d3qnfpd1jvgbl7l8fqd85ns11i0",
"version": "95.0.4638.40",
"sha256": "1v1n113rh5nzfbk5xaq4kp7fdg5n9rca978a9700nmrd0gqpd2hn",
"sha256bin64": "0xadlal8fb7hqjcq6d931if555spw72wa4d23m0fqcan31sky3i0",
"deps": {
"gn": {
"version": "2021-08-11",

6
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View file

@ -46,6 +46,7 @@
, libpsl
, brotli
, microsoft_gsl
, rlottie
}:
# Main reference:
@ -60,7 +61,7 @@ let
in
mkDerivation rec {
pname = "telegram-desktop";
version = "3.1.1";
version = "3.1.8";
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
# Telegram-Desktop with submodules
@ -69,7 +70,7 @@ mkDerivation rec {
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "0h4g8lw9hf9pwmdljavflyn9g9jvjvany7y4vji0qcc1kd99vsnp";
sha256 = "129x733a5h6d5xdf3zdz5j5lz8mv6gas5jcnyhwzyk79df138whq";
};
postPatch = ''
@ -138,6 +139,7 @@ mkDerivation rec {
libpsl
brotli
microsoft_gsl
rlottie
];
cmakeFlags = [

4
pkgs/applications/networking/mailreaders/thunderbird/packages.nix
View file

@ -10,12 +10,12 @@ in
rec {
thunderbird = common rec {
pname = "thunderbird";
version = "91.1.2";
version = "91.2.0";
application = "comm/mail";
binaryName = pname;
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 = "f211ce2469f60862b1d641b5e165292d98db53695ab715090034c1ee2be7b04931f8e5e856b08b0c8c789e4d98df291d59283c257a38b556c0b4b0b63baa539f";
sha512 = "1f21f77069490be2de131f6125a498c6ed0a7d10b2ff787891d8dea10019719fea8014a8b2d626a2365f10f6307b616e5f1eef2c601e4da5402c9d5fc7d35049";
};
patches = [
];

18
pkgs/applications/science/chemistry/avogadro2/default.nix
View file

@ -2,17 +2,29 @@
, openbabel, qttools, wrapQtAppsHook
}:
stdenv.mkDerivation rec {
let
avogadroI18N = fetchFromGitHub {
owner = "OpenChemistry";
repo = "avogadro-i18n";
rev = "3b8a86cc37e988b043d1503d2f11068389b0aca3";
sha256 = "9wLY7/EJyIZYnlUAMsViCwD5kGc1vCNbk8vUhb90LMQ=";
};
in stdenv.mkDerivation rec {
pname = "avogadro2";
version = "1.94.0";
version = "1.95.1";
src = fetchFromGitHub {
owner = "OpenChemistry";
repo = "avogadroapp";
rev = version;
sha256 = "6RaiX23YUMfTYAuSighcLGGlJtqeydNgi3PWGF77Jp8=";
sha256 = "9GnsxQsMuik6CPDmJbJPF0/+LXbZHf/JLevpSsMEoP0=";
};
postUnpack = ''
cp -r ${avogadroI18N} avogadro-i18n
'';
nativeBuildInputs = [ cmake wrapQtAppsHook ];
buildInputs = [

4
pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
View file

@ -21,13 +21,13 @@ let
in stdenv.mkDerivation rec {
pname = "avogadrolibs";
version = "1.94.0";
version = "1.95.1";
src = fetchFromGitHub {
owner = "OpenChemistry";
repo = pname;
rev = version;
sha256 = "6bChJhqrjOxeEWZBNToq3JExHPu7DUMsEHWBDe75zAo=";
sha256 = "0zzVg8xNqFwDrK8gRkDm3tRgBt7fD4K3Uy/ajUBc+eQ=";
};
postUnpack = ''

2
pkgs/development/libraries/science/chemistry/libmsym/default.nix
View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = " molecular point group symmetry lib";
homepage = "https://github.com/rcsb/mmtf-cpp";
homepage = "https://github.com/mcodev31/libmsym";
license = licenses.mit;
platforms = platforms.linux;
maintainers = [ maintainers.sheepforce ];

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

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "aiopg";
version = "1.3.1";
version = "1.3.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "aio-libs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-kAkxulAMtLeL3IAuIVvZtsN5RxHWV/qHyFIYu9Odn34=";
sha256 = "sha256-e7USw3Bx6cpLu9PKDC+eEdPTSjriuSX2Sg+9BeRa9Ko=";
};
propagatedBuildInputs = [

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

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "databases";
version = "0.5.0";
version = "0.5.2";
disabled = isPy27;
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
sha256 = "sha256-HNSPLmZTXZL1e5E9VJiXnQuO2WiXLYOveNTlFqdlTG8=";
sha256 = "sha256-OfBb78lKnAxPhyy2j4TzEZWBzbw64brTQcxuOPoW9pk=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/fastapi/default.nix
View file

@ -13,18 +13,19 @@
, peewee
, python-jose
, sqlalchemy
, trio
}:
buildPythonPackage rec {
pname = "fastapi";
version = "0.68.1";
version = "0.70.0";
format = "flit";
src = fetchFromGitHub {
owner = "tiangolo";
repo = "fastapi";
rev = version;
sha256 = "sha256-zwfopyig4ImMbkx89l8SsLW8PzoVcDN5KSd7a7fOnms=";
sha256 = "sha256-mLI+w9PeewnwUMuUnXj6J2r/3shinjlwXMnhNcQlhrM=";
};
postPatch = ''
@ -48,6 +49,7 @@ buildPythonPackage rec {
pytestCheckHook
pytest-asyncio
sqlalchemy
trio
];
# disabled tests require orjson which requires rust nightly

4
pkgs/development/python-modules/mypy-boto3-s3/default.nix
View file

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "mypy-boto3-s3";
version = "1.18.56";
version = "1.18.57";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "61c74253cb77a0734970703d58a49e29624cec76d97da31fa912faf6f6d3347b";
sha256 = "c157008c4111bb18be21428cd1e35a3265fffc58ebcda4a0019120a5e10add89";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/orjson/default.nix
View file

@ -15,20 +15,20 @@
buildPythonPackage rec {
pname = "orjson";
version = "3.6.3";
version = "3.6.4";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ijl";
repo = pname;
rev = version;
sha256 = "10clf13bp3fqd9b7n1isrfwz7sngcl1j6birqc1xyg9wzfw1kslj";
sha256 = "0xpna70s5v7d4lwsb6ijc0f2rm6p7jqmac9yayx9qb1dasbki6zd";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "163rf8k7qb1whjf78i8v5dlyif1sgvd9xkj8li81j45abgzkq86w";
sha256 = "0m4f8lc0zwxh4lmxkpxvdd2lc2g3lkq0ymllqbyr31sbxvwnxk56";
};
format = "pyproject";

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

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "pyexcel-io";
version = "0.6.4";
version = "0.6.5";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "00f15f4bae2947de49b3206f2600f78780008e044380f7aafe0ce52969cda4ca";
sha256 = "608d8e80da38070d3bb970d132bc47a55dcfd63b4dc03997d93646c5b2ad185b";
};
propagatedBuildInputs = [

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pykka";
version = "3.0.1";
version = "3.0.2";
format = "pyproject";
disabled = pythonOlder "3.6.1";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "jodal";
repo = pname;
rev = "v${version}";
sha256 = "1h3brgm8y4a9s991y0drkp0vvmxix9f2b49f9w6ibhkhr37gc0lh";
sha256 = "1cy4pr05xlsny9g573q7njsv7jaaysi1qzafm6f82y57jqnmziks";
};
nativeBuildInputs = [

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

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "pynws";
version = "1.3.1";
version = "1.3.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "MatthewFlamm";
repo = pname;
rev = "v${version}";
sha256 = "sha256-iWg8UsZeVaOxp35rItywTAlQUbCWe4WWDK4VPCRApcM=";
sha256 = "0d2x3vlm444aar4wbdg48xzpgwng5m7i2d7h1z0pb6c514747sd1";
};
propagatedBuildInputs = [

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

@ -21,7 +21,7 @@ let
if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ];
in buildPythonPackage rec {
pname = "pyopencl";
version = "2021.2.6";
version = "2021.2.8";
checkInputs = [ pytest ];
buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs;
@ -30,7 +30,7 @@ in buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "df208546d28a3274ba7b554d50643ed1e393b8f3f75a43b24b83d3ee76597587";
sha256 = "15809b5d2b9a86ad01e31d176c00415436805ac884c4d197d9263bfe98280d76";
};
# py.test is not needed during runtime, so remove it from `install_requires`

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

@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "qcengine";
version = "0.20.0";
version = "0.20.1";
checkInputs = [
pytest-runner
@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "5b405efb4b6ebe81e7f991b360126a4f61c2768ceed6027346e2b8ef3f57ef39";
sha256 = "hZxE7b0bOx/B8Kz4cgBC7wV23OikRxwrdZ4UQ8G/yhg=";
};
doCheck = true;

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

@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "sagemaker";
version = "2.59.7";
version = "2.59.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-6tNUI08Fp2zITH1ILfVVEU0VhgvLogWfXPr9dkAKQEk=";
sha256 = "655cf9b86fdba71f505e809b97a63c5cd5973158578a141748db83c469e87d87";
};
pythonImportsCheck = [

1
pkgs/development/tools/bunyan-rs/default.nix
View file

@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/LukeMathWalker/bunyan";
license = with licenses; [ asl20 mit ];
maintainers = with maintainers; [ netcrns ];
mainProgram = "bunyan";
};
}

1
pkgs/development/tools/gir/default.nix
View file

@ -19,5 +19,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/gtk-rs/gir/";
license = with licenses; [ mit ];
maintainers = with maintainers; [ ekleog ];
mainProgram = "gir";
};
}

1
pkgs/development/tools/pax-rs/default.nix
View file

@ -14,6 +14,7 @@ buildRustPackage rec {
license = licenses.mit;
maintainers = [ maintainers.klntsky ];
platforms = platforms.linux;
mainProgram = "px";
};
src =

54
pkgs/development/tools/time-ghc-modules/default.nix Normal file
View file

@ -0,0 +1,54 @@
{ lib
, stdenv
, fetchFromGitHub
, makeWrapper
, sqlite
, python3
, coreutils
, findutils
, gnused
}:
stdenv.mkDerivation rec {
pname = "time-ghc-modules";
version = "1.0.1";
src = fetchFromGitHub {
owner = "codedownio";
repo = "time-ghc-modules";
rev = version;
sha256 = "0s6540gllhjn7366inhwa70rdnngnhbi07jn1h6x8a0pi71wdfm9";
};
nativeBuildInputs = [makeWrapper];
buildPhase = ''
runHook preBuild
mkdir -p $out/bin
cp ./time-ghc-modules $out/bin/time-ghc-modules
wrapProgram $out/bin/time-ghc-modules --prefix PATH : ${lib.makeBinPath [ sqlite python3 coreutils findutils gnused ]} \
--set PROCESS_SCRIPT $out/lib/process \
--set HTML_FILE $out/lib/index.html
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/lib
install -m 444 ./dist/index.html $out/lib
install ./scripts/process $out/lib
runHook postInstall
'';
meta = with lib; {
description = "Analyze GHC .dump-timings files";
homepage = "https://github.com/codedownio/time-ghc-modules";
license = licenses.mit;
maintainers = [ maintainers.thomasjm ];
platforms = platforms.all;
};
}

2
pkgs/development/tools/vgo2nix/default.nix
View file

@ -34,6 +34,6 @@ buildGoModule {
homepage = "https://github.com/nix-community/vgo2nix";
license = licenses.mit;
maintainers = with maintainers; [ adisbladis SuperSandro2000 ];
mainProgram = "vgo2nix";
};
}

2
pkgs/servers/nitter/default.nix
View file

@ -46,6 +46,6 @@ nimPackages.buildNimPackage rec {
maintainers = with maintainers; [ erdnaxe ];
license = licenses.agpl3Only;
platforms = [ "x86_64-linux" ];
mainProgram = "nitter";
};
}

1
pkgs/tools/archivers/xtrt/default.nix
View file

@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/figsoda/xtrt";
license = licenses.unlicense;
maintainers = with maintainers; [ figsoda ];
mainProgram = "xtrt";
};
}

1
pkgs/tools/misc/bunnyfetch/default.nix
View file

@ -22,5 +22,6 @@ buildGoModule rec {
license = licenses.mit;
maintainers = with maintainers; [ devins2518 ];
platforms = platforms.linux;
mainProgram = "bunnyfetch";
};
}

1
pkgs/tools/misc/cht.sh/default.nix
View file

@ -45,5 +45,6 @@ stdenv.mkDerivation {
license = licenses.mit;
maintainers = with maintainers; [ fgaz evanjs ];
homepage = "https://github.com/chubin/cheat.sh";
mainProgram = "cht.sh";
};
}

1
pkgs/tools/misc/colorpicker/default.nix
View file

@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/Ancurio/colorpicker";
maintainers = with maintainers; [ jb55 ];
license = licenses.mit;
mainProgram = "colorpicker";
};
}

10
pkgs/tools/misc/fasd/default.nix
View file

@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
PREFIX=$out make install
'';
meta = {
homepage = "https://github.com/clvv/${pname}";
meta = with lib; {
homepage = "https://github.com/clvv/fasd";
description = "Quick command-line access to files and directories for POSIX shells";
license = lib.licenses.mit;
license = licenses.mit;
longDescription = ''
Fasd is a command-line productivity booster.
@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
command line.
'';
platforms = lib.platforms.all;
platforms = platforms.all;
maintainers = with maintainers; [ ];
mainProgram = "fasd";
};
}

2
pkgs/tools/misc/fet-sh/default.nix
View file

@ -25,6 +25,6 @@ stdenvNoCC.mkDerivation rec {
license = licenses.isc;
platforms = platforms.all;
maintainers = with maintainers; [ elkowar ];
mainProgram = "fet.sh";
};
}

1
pkgs/tools/misc/fsearch/default.nix
View file

@ -54,5 +54,6 @@ stdenv.mkDerivation {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ artturin ];
platforms = platforms.unix;
mainProgram = "fsearch";
};
}

3
pkgs/tools/misc/git-fire/default.nix
View file

@ -25,6 +25,7 @@ stdenv.mkDerivation {
homepage = "https://github.com/qw3rtman/git-fire";
license = licenses.mit;
platforms = platforms.all;
maintainers = [ maintainers.swflint ];
maintainers = with maintainers; [ swflint ];
mainProgram = "git-fire";
};
}

1
pkgs/tools/misc/licensor/default.nix
View file

@ -18,5 +18,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/raftario/licensor";
license = licenses.mit;
maintainers = with maintainers; [ Br1ght0ne ];
mainProgram = "licensor";
};
}

1
pkgs/tools/misc/loop/default.nix
View file

@ -18,5 +18,6 @@ rustPlatform.buildRustPackage {
homepage = "https://github.com/Miserlou/Loop";
maintainers = with maintainers; [ koral ];
license = licenses.mit;
mainProgram = "loop";
};
}

1
pkgs/tools/misc/mmv-go/default.nix
View file

@ -20,5 +20,6 @@ buildGoModule rec {
description = "Rename multiple files using your $EDITOR";
license = licenses.mit;
maintainers = with maintainers; [ zowoq ];
mainProgram = "mmv";
};
}

1
pkgs/tools/misc/powerline-go/default.nix
View file

@ -25,5 +25,6 @@ buildGoModule rec {
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ sifmelcara ];
mainProgram = "powerline-go";
};
}

1
pkgs/tools/misc/sta/default.nix
View file

@ -31,5 +31,6 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ infinisil ];
platforms = platforms.all;
badPlatforms = platforms.darwin;
mainProgram = "sta";
};
}

1
pkgs/tools/misc/tab-rs/default.nix
View file

@ -23,5 +23,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/austinjones/tab-rs";
license = licenses.mit;
maintainers = with maintainers; [ bbigras ];
mainProgram = "tab";
};
}

3
pkgs/tools/misc/vimv/default.nix
View file

@ -22,6 +22,7 @@ stdenvNoCC.mkDerivation {
description = "Batch-rename files using Vim";
license = licenses.mit;
platforms = platforms.all;
maintainers = [ maintainers.kmein ];
maintainers = with maintainers; [ kmein ];
mainProgram = "vimv";
};
}

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

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "grype";
version = "0.19.0";
version = "0.22.0";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xSjmwD0V4+LKfLwknQU8PAFOG3zpJ87ghHdA2c+nYQM=";
sha256 = "sha256-5TOfy7eapkvXwVC4TcSo3mWSAkLqBeVco7SG2H21lRo=";
};
vendorSha256 = "sha256-mlsKB/WOiQ2Ud9C19rsQhVtJfblh0CGd8tDs+3SSfcg=";
vendorSha256 = "sha256-pgasbJdyTBIYIeaidKYFLy0LqmCTKE7IUkFqddJtcR0=";
propagatedBuildInputs = [ docker ];

4
pkgs/tools/security/quark-engine/default.nix
View file

@ -6,7 +6,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "quark-engine";
version = "21.8.1";
version = "21.10.2";
disabled = python3.pythonOlder "3.6";
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "0ksmzwji4c98pnqns780n5rdm5r1zx7sc40w8qipk2nf6jncwv6p";
sha256 = "0992wsy3plxpcqmq8cnnl0by1vkmkfb4lq2vb5rsj89wj900ci2n";
};
propagatedBuildInputs = with python3.pkgs; [

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

@ -15045,6 +15045,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security CoreServices;
};
time-ghc-modules = callPackage ../development/tools/time-ghc-modules { };
tflint = callPackage ../development/tools/analysis/tflint { };
tfsec = callPackage ../development/tools/analysis/tfsec { };