Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-12-19 06:01:51 +00:00 committed by GitHub
commit 46528ab039
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 112 additions and 71 deletions

View File

@ -6,13 +6,13 @@
mkDerivation rec {
pname = "sigil";
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitHub {
repo = "Sigil";
owner = "Sigil-Ebook";
rev = version;
sha256 = "sha256-a1gstR7qHbzQ3GZ0g/lxUxcHeZ5QgJIvhCV37tqlVfA=";
sha256 = "sha256-luX4/KERB4GwpID7zVnd6F/mN8SHTy9zmqSUzJ1CYPk=";
};
pythonPath = with python3Packages; [ lxml ];

View File

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "15.8.7";
version = "16.0.0";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
sha256 = "532f9926b4b055cbb741a778d57df42c65c5af82d0a8829e87324eb5e82025e3";
sha256 = "4fae34cf49ece02dd4c7a3cd6c9bf3a3cbda0d555b819482edf886afb164ba4d";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
let
pname = "anytype";
version = "0.21.9";
version = "0.22.3";
name = "Anytype-${version}";
nameExecutable = pname;
src = fetchurl {
url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage";
name = "Anytype-${version}.AppImage";
sha256 = "sha256-By9rNvCY4voiePvYf47DMwPogUPTd5JdaINEE0ei1Is=";
sha256 = "sha256-28qgTWCQrFCREGNfj8bePocEpB+0AZfrKNO4akn7/5I=";
};
appimageContents = appimageTools.extractType2 { inherit name src; };
in

View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, jre, makeWrapper }:
stdenv.mkDerivation rec {
version = "6.9.4";
version = "6.9.5";
pname = "frostwire";
src = fetchurl {
url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz";
sha256 = "sha256-sWvQDUJGytKA9/UbC7fOk6WhDtTqdhyRmW9GvHFMZh4=";
sha256 = "sha256-jMv4wIBsmgg2Q/Q/QDJnWa5wUeD1ur6Lu6eXOCLaGg4=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -7,32 +7,77 @@
let allVersions = with lib; flip map
# N.B. Versions in this list should be ordered from newest to oldest.
[
{
version = "13.0.0";
lang = "en";
language = "English";
sha256 = "15bbad39a5995031325d1d178f63b00e71706d3ec9001eba6d1681fbc991d3e1";
installer = "Mathematica_13.0.0_BNDL_LINUX.sh";
}
{
version = "12.3.1";
lang = "en";
language = "English";
sha256 = "51b9cab12fd91b009ea7ad4968a2c8a59e94dc55d2e6cc1d712acd5ba2c4d509";
installer = "Mathematica_12.3.1_LINUX.sh";
}
{
version = "12.3.0";
lang = "en";
language = "English";
sha256 = "045df045f6e796ded59f64eb2e0f1949ac88dcba1d5b6e05fb53ea0a4aed7215";
installer = "Mathematica_12.3.0_LINUX.sh";
}
{
version = "12.2.0";
lang = "en";
language = "English";
sha256 = "3b6676a203c6adb7e9c418a5484b037974287b5be09c64e7dfea74ddc0e400d7";
installer = "Mathematica_12.2.0_LINUX.sh";
}
{
version = "12.1.1";
lang = "en";
language = "English";
sha256 = "02mk8gmv8idnakva1nc7r7mx8ld02lk7jgsj1zbn962aps3bhixd";
installer = "Mathematica_12.1.1_LINUX.sh";
}
{
version = "12.1.0";
lang = "en";
language = "English";
sha256 = "15m9l20jvkxh5w6mbp81ys7mx2lx5j8acw5gz0il89lklclgb8z7";
installer = "Mathematica_12.1.0_LINUX.sh";
}
{
version = "12.0.0";
lang = "en";
language = "English";
sha256 = "b9fb71e1afcc1d72c200196ffa434512d208fa2920e207878433f504e58ae9d7";
installer = "Mathematica_12.0.0_LINUX.sh";
}
{
version = "11.3.0";
lang = "en";
language = "English";
sha256 = "0fcfe208c1eac8448e7be3af0bdb84370b17bd9c5d066c013928c8ee95aed10e";
installer = "Mathematica_11.3.0_LINUX.sh";
}
{
version = "11.2.0";
lang = "ja";
language = "Japanese";
sha256 = "916392edd32bed8622238df435dd8e86426bb043038a3336f30df10d819b49b1";
installer = "Mathematica_11.2.0_ja_LINUX.sh";
}
]
({ version, lang, language, sha256 }: {
({ version, lang, language, sha256, installer }: {
inherit version lang;
name = "mathematica-${version}" + optionalString (lang != "en") "-${lang}";
src = requireFile rec {
name = "Mathematica_${version}" + optionalString (lang != "en") "_${language}" + "_LINUX.sh";
src = requireFile {
name = installer;
message = ''
This nix expression requires that ${name} is
This nix expression requires that ${installer} is
already part of the store. Find the file on your Mathematica CD
and add it to the nix store with nix-store --add-fixed sha256 <FILE>.
'';

View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "marwaita";
version = "11.3";
version = "12.0";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
sha256 = "sha256-7l3fvqhMMJyv27yv/jShju0hL5AAvHk8pmISj/oyUP4=";
sha256 = "10mf1cbm6a9k0b1vcafy3jb7kicpvnf6xqmn1dfxwsq3k81mmy7d";
};
buildInputs = [

View File

@ -22,11 +22,11 @@
stdenv.mkDerivation rec {
pname = "gnome-remote-desktop";
version = "41.1";
version = "41.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
hash = "sha256-wOiJsO2BGxGAm777FzOElNj1L/USC+bj/9O65angX98=";
hash = "sha256-EBUeabZIwiR8XjPZou9Bn04DfuWyuuSebtasp36xulg=";
};
nativeBuildInputs = [

View File

@ -228,7 +228,7 @@ lib.makeScope pkgs.newScope (self: with self; {
### THIRD-PARTY
# Put packages that ONLY works with Pantheon in pkgs/desktops/pantheon/third-party,
# specfically third party switchboard plugins and wingpanel indicators.
# specifically third party switchboard plugins and wingpanel indicators.
# Please call these packages in pkgs/top-level/all-packages.nix instead of this file.
# https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654

View File

@ -22,19 +22,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel";
version = "3.0.1";
version = "3.0.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "078yi36r452sc33mv2ck8z0icya1lhzhickllrlhc60rdri36sb8";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-WvkQx+9YjKCINpyVg8KjCV0GAb0rJfblSFaO14/4oas=";
};
nativeBuildInputs = [
@ -75,6 +69,12 @@ stdenv.mkDerivation rec {
)
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "The extensible top panel for Pantheon";
longDescription = ''

View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "grpc";
version = "1.42.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
version = "1.43.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
sha256 = "sha256-9/ywbnvd8hqeblFe+X9SM6PkRPB/yqE8Iw9TNmLMSOE=";
sha256 = "sha256-NPyCQsrmD/gBs4UHPGbBACmGRTNQDj6WfnfLNdWulK4=";
fetchSubmodules = true;
};

View File

@ -3,6 +3,8 @@
, fetchFromGitHub
, numpy
, pytestCheckHook
, stdenv
, darwin
}:
buildPythonPackage rec {
@ -16,6 +18,8 @@ buildPythonPackage rec {
sha256 = "0fhxikvlr010nbh02g455d5y8bq6j5yw180cdh4gsd0hb43y3z26";
};
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Accelerate AudioToolbox CoreVideo CoreGraphics ]);
propagatedBuildInputs = [
numpy
];

View File

@ -4,12 +4,12 @@
}:
buildPythonPackage rec {
version = "1.8.8";
version = "1.8.9";
pname = "bids-validator";
src = fetchPypi {
inherit pname version;
sha256 = "e9ebc4cf1004bd343bbb56105b1eb2be833200e466dbaff7dfd267fca044d55e";
sha256 = "01fcb5a8fe6de1280cdfd5b37715103ffa0bafb3c739ca7f5ffc41e46549612e";
};
# needs packages which are not available in nixpkgs

View File

@ -31,7 +31,5 @@ buildPythonPackage rec {
license = licenses.bsdOriginal;
description = "Python bindings for Capstone disassembly engine";
maintainers = with maintainers; [ bennofs ris ];
# creates a manylinux2014-x86_64 wheel
broken = !stdenv.isx86_64;
};
}

View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "django-ipware";
version = "4.0.0";
version = "4.0.2";
src = fetchPypi {
inherit pname version;
sha256 = "1294f916f3b3475e40e1b0ec1bd320aa2397978eae672721c81cbc2ed517e9ee";
sha256 = "602a58325a4808bd19197fef2676a0b2da2df40d0ecf21be414b2ff48c72ad05";
};
propagatedBuildInputs = [ django ];

View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "grpcio-tools";
version = "1.42.0";
version = "1.43.0";
src = fetchPypi {
inherit pname version;
sha256 = "d0a0daa82eb2c2fb8e12b82a458d1b7c5516fe1135551da92b1a02e2cba93422";
sha256 = "f42f1d713096808b1b0472dd2a3749b712d13f0092dab9442d9c096446e860b2";
};
outputs = [ "out" "dev" ];

View File

@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "holoviews";
version = "1.14.6";
version = "1.14.7";
src = fetchPypi {
inherit pname version;
sha256 = "3a25c4fe3195fdc4639461abbfa5a8bebce8ab737674b6673da2236a901cfefd";
sha256 = "8d8d171227e9c9eaadd4b037b3ddaa01055a33bacbdbeb57a5efbd273986665f";
};
propagatedBuildInputs = [

View File

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "Pympler";
version = "0.9";
version = "1.0";
src = fetchPypi {
inherit pname version;
sha256 = "f2cbe7df622117af890249f2dea884eb702108a12d729d264b7c5983a6e06e47";
sha256 = "f2e82c3e33835d0378ed95fffabc00806f4070f00decaa38b340ca99b1aca25c";
};
postPatch = ''

View File

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "python-vipaccess";
version = "0.13";
version = "0.14";
src = fetchPypi {
inherit pname version;
sha256 = "f148d4534e3a4dda9050a6a038868594c1216ea2413f2144ca6697e0e20c9cad";
sha256 = "d5013d306e5891ecfe523c9ef52d074fe8b6ca29ee259c0deeb8a83ae9884ce0";
};
propagatedBuildInputs = [

View File

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "scp";
version = "0.14.1";
version = "0.14.2";
src = fetchPypi {
inherit pname version;
sha256 = "b776bd6ce8c8385aa9a025b64a9815b5d798f12d4ef0d712d569503f62aece8b";
sha256 = "713f117413bbd616a1a7da8f07db9adcd835ce73d8585fb469ea5b5785f92e4d";
};
propagatedBuildInputs = [

View File

@ -40,14 +40,14 @@
buildPythonPackage rec {
pname = "sentry-sdk";
version = "1.5.0";
version = "1.5.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-python";
rev = version;
sha256 = "sha256-hJqopR/kvqU0trniHMOahi3oeIzeMvc74ujmfJ2iG48=";
sha256 = "sha256-vQ5zeAscPMQH3L+Ogj50IZZp2pBoYaxHzvcXakaoC4k=";
};
propagatedBuildInputs = [

View File

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "snowflake-sqlalchemy";
version = "1.3.2";
version = "1.3.3";
src = fetchPypi {
inherit pname version;
sha256 = "51d9d923ebbfefe392582f6e3d0faa83f52e5eb6f190607820e055318dd2d2f8";
sha256 = "d1c087ce0a90bbce77f2308b9c4aeb14efeb26a3ae9da7c3d5a153341cd8ef34";
};
propagatedBuildInputs = [

View File

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "striprtf";
version = "0.0.16";
version = "0.0.17";
src = fetchPypi {
inherit pname version;
sha256 = "690387117f3341354fddd0957913158d1319c207755c0cc54a614f80248887b2";
sha256 = "e122b5d334cda9b0edb3eeb8910f01d0ffb02eaca054facd75b17b98fcf646f5";
};
meta = with lib; {

View File

@ -52,14 +52,14 @@ let newPython = python3.override {
};
in newPython.pkgs.buildPythonApplication rec {
version = "1.40.0";
version = "1.43.1";
pname = "conan";
src = fetchFromGitHub {
owner = "conan-io";
repo = "conan";
rev = version;
sha256 = "1sb4w4wahasrwxkag1g79f135601sca6iafv4r4836f2vi48ka2d";
sha256 = "0jwi7smgy2d9m49igijqr2p4ncw5nksjbijj8fzjvf1lgxgnyjhr";
};
propagatedBuildInputs = with newPython.pkgs; [

View File

@ -2,25 +2,19 @@
rustPlatform.buildRustPackage rec {
pname = "just";
version = "0.10.3";
version = "0.10.5";
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = version;
sha256 = "sha256-r6kP1LbT8ZQoxSuy7jpnHD2/RgcPvmTNfjKzj5ceXRc=";
sha256 = "sha256-PbWV8It/ubDbZooJdt/KWihnp221Pexs0U6zMa8KSMw=";
};
cargoSha256 = "sha256-y6RcFH2qDoM3wWnZ6ewC9QyRD3mFsoakToRmon4bAnE=";
cargoSha256 = "sha256-VRfk6566SNmvCxtD9EdDxDdBvQuEfjPVggXzt4VoYRg=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
postPatch = ''
# this hard codes the compiler, which breaks the aarch64 in particular
# we rather want to set the compiler ourself
rm .cargo/config
'';
postInstall = ''
installManPage man/just.1

View File

@ -363,8 +363,8 @@ let
mktplcRef = {
name = "bracket-pair-colorizer-2";
publisher = "CoenraadS";
version = "0.2.1";
sha256 = "0bfvzs4ac537zqhnqaa38jf4lhiy1fmqcv6lq89nnx8k963380z7";
version = "0.2.2";
sha256 = "0zcbs7h801agfs2cggk1cz8m8j0i2ypmgznkgw17lcx3zisll9ad";
};
meta = with lib; {
license = licenses.mit;
@ -529,8 +529,8 @@ let
mktplcRef = {
name = "gitlens";
publisher = "eamodio";
version = "11.6.0";
sha256 = "sha256-JxCNE/IL/v94xWmhebsRZo1Gw+nSSpDgZ41ZGongGVI=";
version = "11.7.0";
sha256 = "0apjjlfdwljqih394ggz2d8m599pyyjrb0b4cfcz83601b7hk3x6";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "abcMIDI";
version = "2021.12.10";
version = "2021.12.12";
src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
hash = "sha256-Jvj7gOrIT0IXihPkPDH9n80bg4xllvPTKxIWA3wX5B0=";
hash = "sha256-34yRMa68x93u8/fGTzflh1L/Lf7ULPXsDaC7GUy+i8g=";
};
meta = with lib; {

View File

@ -16,16 +16,16 @@
rustPlatform.buildRustPackage rec {
pname = "gpg-tui";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "orhun";
repo = "gpg-tui";
rev = "v${version}";
sha256 = "sha256-2fTJHcJJzQIAyxLnWdoyR77tA9p/3s3UescypGwKfc0=";
hash = "sha256-jddkws4TXuW0AdLBEpS5RPk1a/mEkwYWMbYiLjt22LU=";
};
cargoSha256 = "sha256-8dWMJZiWy0cO0CGAFEmtGYZ8bVK1ZR7qBkjKn6rLC+k=";
cargoHash = "sha256-bj77fMmpXeOqb1MzOPsEPQUh5AnZxBrapzt864V+IUU=";
nativeBuildInputs = [
gpgme # for gpgme-config

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "lmp";
version = "1.0";
version = "1.1";
src = fetchFromGitHub {
owner = "0xInfection";
repo = "LogMePwn";
rev = "v${version}";
sha256 = "sha256-EDhNnNmIVBtBj+zHjLzW60sdI0dH8cLvXDQBmVgM4hM=";
sha256 = "sha256-3kxMtkHkqo5Gwk864Bb8MqRtuC8HP38Xl22ktiTgr5k=";
};
vendorSha256 = "sha256-X7Djcp4reOXL6SX4jiSLicolENu7Uo5webSePYrPKug=";