JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-01-22 12:01:15 +00:00 committed by GitHub
commit 413effd66b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 537 additions and 476 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/scli/default.nix
View File

@ -8,13 +8,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "scli";
version = "0.6.5";
version = "0.6.6";
src = fetchFromGitHub {
owner = "isamert";
repo = pname;
rev = "v${version}";
sha256 = "1lykxkqscvpzb7bvl8kfaf23mjhr2kaaqdg0756xx4z1m0smpkgy";
sha256 = "16hfp8dn270amrilvv3sjqhq2x295kw0cxszf63jh405z3ql834g";
};
propagatedBuildInputs = with python3.pkgs; [

6
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -19,9 +19,9 @@
}
},
"beta": {
"version": "98.0.4758.54",
"sha256": "0w3pvp23y0vyj9p7j6nfxgnnzc5jyjn65k1khx0i333hs97vidbc",
"sha256bin64": "1qxkqw45jzcrg2ziqh4npg19a52b5j1hvag4n5qlrq4bfblsbwwh",
"version": "98.0.4758.66",
"sha256": "06hdd2cy6mdiiwbrn2jawmcidxbf46z9wyklkm3mmzbrj1xrh0gd",
"sha256bin64": "0r1lmgvvxb1h6p20gzp8qwdfs4czvqyg6bgp4wb2aax1n0448rbr",
"deps": {
"gn": {
"version": "2021-12-07",

786
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

5
pkgs/applications/networking/browsers/google-chrome/default.nix
View File

@ -44,7 +44,7 @@
, libvaSupport ? true, libva
# For Vulkan support (--enable-features=Vulkan)
, vulkanSupport ? true, vulkan-loader
, addOpenGLRunpath
}:
with lib;
@ -70,7 +70,6 @@ let
libxkbcommon pipewire wayland
] ++ optional pulseSupport libpulseaudio
++ optional libvaSupport libva
++ optional vulkanSupport vulkan-loader
++ [ gtk3 ];
suffix = if channel != "stable" then "-" + channel else "";
@ -143,7 +142,7 @@ in stdenv.mkDerivation {
makeWrapper "$out/share/google/$appname/google-$appname" "$exe" \
--prefix LD_LIBRARY_PATH : "$rpath" \
--prefix PATH : "$binpath" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addOpenGLRunpath.driverLink}/share" \
--add-flags ${escapeShellArg commandLineArgs}
for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary},nacl_helper}; do

4
pkgs/applications/networking/flexget/default.nix
View File

@ -2,14 +2,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.2.8";
version = "3.2.11";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "v${version}";
sha256 = "0hr19f678pyd7mnzclfv7imh9s2m01k92dza1csyfacclvri8m07";
sha256 = "1l9xy8k0imfdg4r03k659f85z945bksx672gqhkchf2svi2vnvql";
};
postPatch = ''

8
pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
View File

@ -28,15 +28,13 @@
stdenv.mkDerivation rec {
pname = "elementary-calendar";
version = "6.0.3";
repoName = "calendar";
version = "6.1.0";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "calendar";
rev = version;
sha256 = "sha256-+RQUiJLuCIbmcbtsOCfF9HYFrxtldZMbg2vg/a/IOaY=";
sha256 = "sha256-LaVJ7QLc0UdSLgLIuHP4Anc7kPUelZW9PnIWuqKGtEQ=";
};
nativeBuildInputs = [

27
pkgs/development/compilers/avra/default.nix
View File

@ -1,28 +1,23 @@
{ lib, stdenv, fetchurl, autoconf, automake }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "avra";
version = "1.3.0";
version = "1.4.2";
src = fetchurl {
url = "mirror://sourceforge/avra/avra-${version}.tar.bz2";
sha256 = "04lp0k0h540l5pmnaai07637f0p4zi766v6sfm7cryfaca3byb56";
src = fetchFromGitHub {
owner = "Ro5bert";
repo = pname;
rev = version;
hash = "sha256-joOj89WZ9Si5fcu1w1VHj5fOcnB9N2313Yb29A+nCCY=";
};
buildInputs = [ autoconf automake ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
preConfigure = ''
cd src/
aclocal
autoconf
touch NEWS README AUTHORS ChangeLog
automake -a
'';
doCheck = true;
meta = with lib; {
description = "Assembler for the Atmel AVR microcontroller family";
homepage = "http://avra.sourceforge.net/";
homepage = "https://github.com/Ro5bert/avra";
license = licenses.gpl2Plus;
platforms = platforms.all;
};

17
pkgs/development/compilers/gavrasm/default.nix
View File

@ -1,36 +1,45 @@
{ lib, stdenv, fetchzip, fpc , lang ? "en" } :
assert lib.assertOneOf "lang" lang ["cn" "de" "en" "fr" "tr"];
stdenv.mkDerivation rec {
pname = "gavrasm";
version = "4.5";
version = "5.1";
flatVersion = lib.strings.replaceStrings ["."] [""] version;
src = fetchzip {
url ="http://www.avr-asm-tutorial.net/gavrasm/v45/gavrasm_sources_lin_45.zip";
sha256 = "1f5g5ran74pznwj4g7vfqh2qhymaj3p26f2lvzbmlwq447iid52c";
url = "http://www.avr-asm-tutorial.net/gavrasm/v${flatVersion}/gavrasm_sources_lin_${flatVersion}.zip";
sha256 = "0k94f8k4980wvhx3dpl1savpx4wqv9r5090l0skg2k8vlhsv58gf";
stripRoot=false;
};
nativeBuildInputs = [ fpc ];
configurePhase = ''
runHook preConfigure
cp gavrlang_${lang}.pas gavrlang.pas
runHook postConfigure
'';
buildPhase = ''
runHook preBuild
fpc gavrasm.pas
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp gavrasm $out/bin
mkdir -p $out/doc
cp instr.asm $out/doc
cp ReadMe.Txt $out/doc
cp LiesMich.Txt $out/doc
runHook postInstall
'';
meta = with lib; {
homepage = "http://www.avr-asm-tutorial.net/gavrasm";
homepage = "http://www.avr-asm-tutorial.net/gavrasm/";
description = "AVR Assembler for ATMEL AVR-Processors";
license = licenses.unfree;
maintainers = with maintainers; [ mafo ];

11
pkgs/development/libraries/assimp/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, boost, zlib }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, zlib }:
stdenv.mkDerivation rec {
pname = "assimp";
@ -12,6 +12,15 @@ stdenv.mkDerivation rec {
hash = "sha256-GNSfaP8O5IsjGwtC3DFaV4OiMMUXIcmHmz+5TCT/HP8=";
};
patches = [
# Fix include directory with split outputs
# https://github.com/assimp/assimp/pull/4337
(fetchpatch {
url = "https://github.com/assimp/assimp/commit/5dcaf445c3da079cf43890a0688428a7e1de0b30.patch";
sha256 = "sha256-KwqTAoDPkhFq469+VaUuGoqfymu2bWLG9W3BvFvyU5I=";
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [ boost zlib ];

22
pkgs/development/nim-packages/jsony/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib, buildNimPackage, fetchFromGitHub }:
buildNimPackage rec {
pname = "jsony";
version = "1.1.3";
src = fetchFromGitHub {
owner = "treeform";
repo = pname;
rev = version;
hash = "sha256-jtUCoqwCmE536Kpv/vZxGgqiHyReZf1WOiBdUzmMhM4=";
};
doCheck = true;
meta = with lib;
src.meta // {
description = "A loose, direct to object json parser with hooks";
license = [ licenses.mit ];
maintainers = [ maintainers.erdnaxe ];
};
}

4
pkgs/development/python-modules/django-anymail/default.nix
View File

@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "django-anymail";
version = "8.4";
version = "8.5";
src = fetchFromGitHub {
owner = "anymail";
repo = pname;
rev = "v${version}";
sha256 = "08ac24hrafkk1jg3milfjky3qni1cz5qggp1rgzq9r7ina4akjma";
sha256 = "1p2c7hf9baxr8khk8h7y8d38imw4zm920dgd9nbda18vlh7gpbcf";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/dogpile-cache/default.nix
View File

@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "dogpile-cache";
version = "1.1.4";
version = "1.1.5";
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "dogpile.cache";
inherit version;
sha256 = "ea09bebf24bb7c028caf98963785fe9ad0bd397305849a3303bc5380d468d813";
sha256 = "0f01bdc329329a8289af9705ff40fadb1f82a28c336f3174e12142b70d31c756";
};
preCheck = ''

4
pkgs/development/python-modules/green/default.nix
View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "green";
version = "3.4.0";
version = "3.4.1";
format = "setuptools";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "6325681c94afd0f225c7ea2dcfedfde88c859d60da384d54c9ee70b91e434b14";
sha256 = "5dda2d2a277012227011f8f21523d70a550ebe5d47cc890fa16b9fcd9a91da53";
};
patches = [

28
pkgs/development/python-modules/ipwhl/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut
, ipfs, packaging, tomli }:
buildPythonPackage rec {
pname = "ipwhl";
version = "1.0.0";
format = "flit";
disabled = pythonOlder "3.6";
src = fetchFromSourcehut {
owner = "~cnx";
repo = "ipwhl-utils";
rev = version;
sha256 = "sha256-KstwdmHpn4ypBNpX56NeStqdzy5RElMTW1oR2hCtJ7c=";
};
buildInputs = [ ipfs ];
propagatedBuildInputs = [ packaging tomli ];
doCheck = false; # there's no test
pythonImportsCheck = [ "ipwhl" ];
meta = with lib; {
description = "Utilities for the InterPlanetary Wheels";
homepage = "https://git.sr.ht/~cnx/ipwhl-utils";
license = licenses.agpl3Plus;
maintainers = [ maintainers.McSinyx ];
};
}

4
pkgs/development/python-modules/pywayland/default.nix
View File

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "pywayland";
version = "0.4.8";
version = "0.4.9";
src = fetchPypi {
inherit pname version;
sha256 = "abby4o9LmiRZwNkPhYfFOWgRtxU8e5CURQnutz6cWjQ=";
sha256 = "EJ/Ul1ZpIQa5Mw6UmkRi7GC+b+mCMqhto6EsfNjpCdg=";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/development/python-modules/youtube-search-python/default.nix
View File

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "youtube-search-python";
version = "1.5.3";
version = "1.6.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "4bc39224d1f0915692101a7739289c41173de2eb88b445aabc7be284802b7489";
sha256 = "57efe3ac32bdedc8378d907b230191a7de3ed22d0359d7b55d8355039231f974";
};
propagatedBuildInputs = [ httpx ];

6
pkgs/development/tools/rgp/default.nix
View File

@ -19,15 +19,15 @@
}:
let
buildNum = "2021-06-30-819";
buildNum = "2022-01-18-884";
in
stdenv.mkDerivation rec {
pname = "rgp";
version = "1.11";
version = "1.12";
src = fetchurl {
url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz";
sha256 = "ru+e/oY844x4nvSVRBrTGDdnzUOBhwkaIrnftBITyE8=";
sha256 = "88ot16N8XtRlDCP+zIaOqG5BuR0OyG/0u1NEXsun/nY=";
};
nativeBuildInputs = [ makeWrapper autoPatchelfHook ];

4
pkgs/development/tools/vultr-cli/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "vultr-cli";
version = "2.11.3";
version = "2.12.0";
src = fetchFromGitHub {
owner = "vultr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-UI7D5bvfyGsNa6Gd1XuFu1VgiIQJ/b0g6DQlsJbaocI=";
sha256 = "sha256-mT99flZAAhLSynD/8+fa74Mc3KK8pVs+OOFDYNSBzEE=";
};
vendorSha256 = null;

4
pkgs/servers/monitoring/riemann/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "riemann";
version = "0.3.7";
version = "0.3.8";
src = fetchurl {
url = "https://github.com/riemann/riemann/releases/download/${version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-WpJsmb74RhMMKGdNHcYcG4TA+QgpliQ2Ae89JkIjaAo=";
sha256 = "sha256-MjTUrqdi9K71PhpLzR3lqdOiNM7Ilmh8HWf3BUOr+b0=";
};
nativeBuildInputs = [ makeWrapper ];

15
pkgs/servers/nitter/default.nix
View File

@ -2,32 +2,29 @@
nimPackages.buildNimPackage rec {
pname = "nitter";
version = "unstable-2021-12-31";
version = "unstable-2022-01-32";
nimBinOnly = true;
src = fetchFromGitHub {
owner = "zedeus";
repo = "nitter";
rev = "9d117aa15b3c3238cee79acd45d655eeb0e46293";
sha256 = "06hd3r1kgxx83sl5ss90r39v815xp2ki72fc8p64kid34mcn57cz";
rev = "cdb4efadfeb5102b501c7ff79261fefc7327edb9";
sha256 = "sha256-kNK0UQd1whkaZwj98b2JYtYwjUSE1qBcAYytqnSaK1o=";
};
buildInputs = with nimPackages; [
jester
karax
sass
regex
unicodedb
unicodeplus
segmentation
nimcrypto
markdown
packedjson
supersnappy
redpool
flatty
zippy
redis
zippy
flatty
jsony
];
postBuild = ''

6
pkgs/shells/nushell/default.nix
View File

@ -18,16 +18,16 @@
rustPlatform.buildRustPackage rec {
pname = "nushell";
version = "0.42.0";
version = "0.43.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-2EBy61K/HCdCFZkVT5XrflQGuQrRWfdrevV3OPjpUcQ=";
sha256 = "sha256-LSKddSDmXKRnD6PuCPCg/AUMj5y1lzFD24aqVrP7NjU=";
};
cargoSha256 = "sha256-iU19rHb1td4NIF+P3wctIcZKL09H+51XwD3NaSBKK18=";
cargoSha256 = "sha256-gVjOsRDL7u3bXqmHVaqfQnPfGw9Qny4ETRYyhwyEoI0=";
nativeBuildInputs = [ pkg-config ]
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ];

4
pkgs/tools/admin/mycli/default.nix
View File

@ -7,11 +7,11 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "mycli";
version = "1.24.2";
version = "1.24.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-XrPho+bPjyzj2d6W4KR4P09T1/FXkrQvhGPotgooIB4=";
sha256 = "sha256-Qk2qOXfAM7xJv1fDt/mnb2NZFf5S/ExonQtLE4m22a4=";
};
propagatedBuildInputs = [

4
pkgs/tools/misc/nncp/default.nix
View File

@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
pname = "nncp";
version = "8.1.0";
version = "8.2.0";
outputs = [ "out" "doc" "info" ];
src = fetchurl {
url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz";
sha256 = "sha256-d3U233dedtZrBWRdb0QElNOd/L1+Ut4CWvkZo5TPU+w=";
sha256 = "sha256-WbDW4kjTAokpOVtjXU4M8RS8TeD0+fEFLgSShJgO6t0=";
};
nativeBuildInputs = [ go redo-apenwarr ];

3
pkgs/tools/misc/skim/default.nix
View File

@ -32,6 +32,9 @@ rustPlatform.buildRustPackage rec {
chmod +x $out/bin/sk-share
'';
# https://github.com/lotabout/skim/issues/440
doCheck = !stdenv.isAarch64;
meta = with lib; {
description = "Command-line fuzzy finder written in Rust";
homepage = "https://github.com/lotabout/skim";

4
pkgs/tools/misc/snore/default.nix
View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "0.1";
version = "0.2";
pname = "snore";
src = fetchFromGitHub {
owner = "clamiax";
repo = pname;
rev = version;
sha256 = "1ic1qy6ybnjlkz5rb1hpvq6dcdmxw5xcx34qcadrsfdjizxcv8pp";
sha256 = "sha256-EOwbRqtQEuGZ+aeCBNVfLUq4m/bFWJTvMDM6a+y74qc=";
};
makeFlags = [ "PREFIX=${placeholder "out"}" ];

21
pkgs/tools/networking/pcapc/default.nix
View File

@ -1,27 +1,24 @@
{ lib, stdenv, fetchFromGitHub, libpcap, cmake }:
{ lib, stdenv, fetchFromGitLab, libpcap }:
stdenv.mkDerivation rec {
pname = "pcapc";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
sha256 = "137crs0bb7kh9a8p9g168yj2jrp0h3j3073nwh31jy4nk0g5hlfp";
src = fetchFromGitLab {
owner = "post-factum";
repo = pname;
rev = "v${version}";
repo = "pcapc";
owner = "pfactum";
hash = "sha256-oDg9OSvi9aQsZ2SQm02NKAcppE0w5SGZaI13gdp7gv4=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libpcap ];
makeFlags = [ "PREFIX=$(out)" ];
doCheck = false;
makeFlags = [ "PREFIX=${placeholder "out"}" ];
meta = with lib; {
homepage = "https://github.com/pfactum/pcapc";
homepage = "https://gitlab.com/post-factum/pcapc";
description = "Compile libpcap filter expressions into BPF opcodes";
license = licenses.gpl3;
license = licenses.gpl3Only;
platforms = platforms.linux;
};
}

2
pkgs/top-level/nim-packages.nix
View File

@ -30,6 +30,8 @@ lib.makeScope newScope (self:
jsonschema = callPackage ../development/nim-packages/jsonschema { };
jsony = callPackage ../development/nim-packages/jsony { };
karax = callPackage ../development/nim-packages/karax { };
lscolors = callPackage ../development/nim-packages/lscolors { };

2
pkgs/top-level/python-packages.nix
View File

@ -4001,6 +4001,8 @@ in {
iptools = callPackage ../development/python-modules/iptools { };
ipwhl = callPackage ../development/python-modules/ipwhl { };
ipy = callPackage ../development/python-modules/IPy { };
ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { };