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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-10-10 06:16:58 +00:00 committed by GitHub
commit 96dc7cf3d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 91 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/cudatext/default.nix
View File

@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cudatext";
version = "1.172.0";
version = "1.172.5";
src = fetchFromGitHub {
owner = "Alexey-T";
repo = "CudaText";
rev = version;
hash = "sha256-AYIgYLrOVutsv0cHUd/TwNAyLbog6xjcepV9/3fTshc=";
hash = "sha256-bet0hLplxTjizYhRKDqafsps1kULW8jves1faEeLAKE=";
};
postPatch = ''

4
pkgs/applications/editors/cudatext/deps.json
View File

@ -16,8 +16,8 @@
},
"ATSynEdit": {
"owner": "Alexey-T",
"rev": "2022.10.01",
"hash": "sha256-cfjpPTOc8KjhaD1wVY3Tb/lQwEeT3Rq22lJ1MKdTNF0="
"rev": "2022.10.09",
"hash": "sha256-FUqkKcX0UbknvhntIo782ZGIteEE1SvPsfXo4yv6310="
},
"ATSynEdit_Cmp": {
"owner": "Alexey-T",

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

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "albert";
version = "0.17.3";
version = "0.17.6";
src = fetchFromGitHub {
owner = "albertlauncher";
repo = "albert";
rev = "v${version}";
sha256 = "sha256-UIG6yLkIcdf5IszhNPwkBcSfZe4/CyI5shK/QPOmpPE=";
sha256 = "sha256-nbnywrsKvFG8AkayjnylOKSnn7rRWgNv5zE9DDeOmLw=";
fetchSubmodules = true;
};

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

@ -11,13 +11,13 @@ assert x11Support -> xorg != null;
stdenv.mkDerivation rec {
pname = "bemenu";
version = "0.6.11";
version = "0.6.12";
src = fetchFromGitHub {
owner = "Cloudef";
repo = pname;
rev = version;
sha256 = "sha256-M8ezaXu62GYzP8xt5ke1I1IIdUcyTk6vtVbJszU7/6g=";
sha256 = "sha256-u8DQn1WIQjt1Be3WMAUNr/4qQm4vLGaj5RY49sQVpFI=";
};
nativeBuildInputs = [ pkg-config pcre ];

19
pkgs/applications/misc/genact/default.nix
View File

@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub, jq }:
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "genact";
@ -11,22 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-POOXawhxrPT2UgbSZE3r0br7cqJ0ao7MpycrPYa/oCc=";
};
cargoSha256 = "sha256-wpCzWJglX3FnNySnBRJjFWST5FIG5wAO7u+D4VIevtU=";
depsExtraArgs = {
nativeBuildInputs = [ jq ];
postBuild = ''
pushd $name/humansize
[ -d feature-tests ] && rm -r feature-tests
jq '.files |= with_entries(select(.key | startswith("feature-tests") | not))' \
-c .cargo-checksum.json > .cargo-checksum.json.new
mv .cargo-checksum.json{.new,}
popd
'';
};
cargoSha256 = "sha256-2c34YarMFw2CK+7zn41GL5tXfXfnw3NvGtgSlPH5d64=";
meta = with lib; {
description = "A nonsense activity generator";

6
pkgs/applications/misc/wtf/default.nix
View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "wtf";
version = "0.41.0";
version = "0.42.0";
src = fetchFromGitHub {
owner = "wtfutil";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Y8Vdh6sMMX8pS4zIuOfcejfsOB5z5mXEpRskJXQgU1Y=";
sha256 = "sha256-6dSKambBAi1JHVyhq9xBUx5X6QmjsZCV8lENB55Wzto=";
};
vendorSha256 = "sha256-UE7BYal8ycU7mM1TLJMhoNxQKZjtsO9rJ+YXmLiOSk0=";
vendorSha256 = "sha256-Qe+u0u/NBXpEDvfKAF50Uxu5rh8BLa7N0wJ4bEuKOps=";
doCheck = false;

4
pkgs/applications/networking/browsers/elinks/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib
{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libX11, bzip2, zlib
, brotli, zstd, xz, openssl, autoreconfHook, gettext, pkg-config, libev
, gpm, libidn, tre, expat
, # Incompatible licenses, LGPLv3 - GPLv2
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
ncurses xlibsWrapper bzip2 zlib brotli zstd xz
ncurses libX11 bzip2 zlib brotli zstd xz
openssl libidn tre expat libev
]
++ lib.optional stdenv.isLinux gpm

5
pkgs/applications/networking/cluster/nixops/default.nix
View File

@ -64,11 +64,6 @@ let
html=$(mktemp -d)
sphinx-build -b html -d $doc_cache doc/ $out/share/nixops/doc
# Override buggy nixpkgs function
pythonOutputDistPhase() {
echo "no-op output dist phase"
}
'';
};

31
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -11,13 +11,14 @@
"version": "2.5.2"
},
"acme": {
"hash": "sha256-nafJJ2Gr2jA09mjh8hozdDgl67h+10D35KtqjTUPgBE=",
"hash": "sha256-H+1/Au/jCxNxrV+kk6tylUF85taZcs44uWed1QH1aRo=",
"owner": "vancluever",
"provider-source-address": "registry.terraform.io/vancluever/acme",
"proxyVendor": true,
"repo": "terraform-provider-acme",
"rev": "v2.10.0",
"vendorHash": "sha256-lNI0u8DCBl4mGVecRfAqieCooyJlqK+Z4eixPFFyBuU=",
"version": "2.10.0"
"rev": "v2.11.1",
"vendorHash": "sha256-QGZKoxiSiT78gk2vc8uE6k1LAi/S1o5W9TZN7T/1XfA=",
"version": "2.11.1"
},
"age": {
"hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=",
@ -403,14 +404,14 @@
},
"fortios": {
"deleteVendor": true,
"hash": "sha256-jXaEGWt/O0Cv15ksFax571f6aoDhVpNZSbvbOFj6TZ4=",
"hash": "sha256-nvK5mbQdCB6lmdyhJbMS15eOER8eIAYv26mc1FCifXs=",
"owner": "fortinetdev",
"provider-source-address": "registry.terraform.io/fortinetdev/fortios",
"proxyVendor": true,
"repo": "terraform-provider-fortios",
"rev": "v1.15.0",
"vendorHash": "sha256-QsUJ9BqoCtMC9PpGzwlKvBn+BDlcjUR2rU9zx8FvLCk=",
"version": "1.15.0"
"rev": "v1.16.0",
"vendorHash": "sha256-ZgVA2+2tu17dnAc51Aw3k6v8k7QosNTmFjFhmeknxa8=",
"version": "1.16.0"
},
"gandi": {
"hash": "sha256-uXZcYiNsBf5XsMjOjjQeNtGwLhTgYES1E9t63fBEI6Q=",
@ -623,13 +624,13 @@
"version": "3.10.0"
},
"ksyun": {
"hash": "sha256-y7F6eCyiYVtiBaHCaZyUUPAE9GkKo/m/OY98EeBd8DU=",
"hash": "sha256-sfvmDByxAQbbdPHb9l5tIT5dyu8eA3r63i5FZJYEYTI=",
"owner": "kingsoftcloud",
"provider-source-address": "registry.terraform.io/kingsoftcloud/ksyun",
"repo": "terraform-provider-ksyun",
"rev": "v1.3.54",
"rev": "v1.3.55",
"vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ=",
"version": "1.3.54"
"version": "1.3.55"
},
"kubectl": {
"hash": "sha256-UkUwWi7Z9cSMyZakD6JxMl+qdczAYfZQgwroCUjFIUM=",
@ -659,13 +660,13 @@
"version": "2.9.3"
},
"libvirt": {
"hash": "sha256-PmaGBKAaOInLId6r6D29YOedqEA1EreVvI1oRtegPfQ=",
"hash": "sha256-j5EcxmkCyHwbXzvJ9lfQBRBYa3SbrKc3kbt1KZTm0gY=",
"owner": "dmacvicar",
"provider-source-address": "registry.terraform.io/dmacvicar/libvirt",
"repo": "terraform-provider-libvirt",
"rev": "v0.6.14",
"vendorHash": "sha256-yrz6o2iEAVtc8+dn+KNAGaGy5TtfFMrL4I9sff7SAM8=",
"version": "0.6.14"
"rev": "v0.7.0",
"vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=",
"version": "0.7.0"
},
"linode": {
"hash": "sha256-gysdJOGUmhwFoRpR0Yp2p/Vjb69k+fDzcWatOgA+/AQ=",

4
pkgs/applications/networking/cluster/vcluster/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "vcluster";
version = "0.12.1";
version = "0.12.2";
src = fetchFromGitHub {
owner = "loft-sh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KRm6+WRMGzM7L17ABj/g6Nu+eU6F3C4a9CAa0ePC6i8=";
sha256 = "sha256-PkayQ1sLjnA+1Xatgs0EvZTCTfWV5uoYYtnKX8OAwYQ=";
};
vendorSha256 = null;

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

@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.3.32";
version = "3.3.33";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "refs/tags/v${version}";
hash = "sha256-AeEVsgJtg9QVSstliKNbwogbXKpVhL3VnnsnEqg27wc=";
hash = "sha256-dJdRGqHBPbdGrxqhOmQJSZmR+YacQCDKgu03WtrGqVA=";
};
postPatch = ''

4
pkgs/applications/office/portfolio/default.nix
View File

@ -26,11 +26,11 @@ let
in
stdenv.mkDerivation rec {
pname = "PortfolioPerformance";
version = "0.59.1";
version = "0.59.2";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
sha256 = "sha256-isa9hVs7bTWP0CDLLKKek7hUe4b5OuEkA5m9UARZZ30=";
sha256 = "sha256-qfetuy1Pa4kWu4ykuELVIE0iC9eAr6qAwVZkEbqqFi0=";
};
nativeBuildInputs = [

4
pkgs/data/themes/obsidian2/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "theme-obsidian2";
version = "2.20";
version = "2.21";
src = fetchurl {
url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz";
sha256 = "0bbw8far4fjz7fiy205wnzp9ibnvqspfcjkinhjj8l0s272h7wjp";
sha256 = "sha256-ptiJeb4ebfnH6HpTN1NsPAYbkLlPcZtn2aBKO0zW2Tw=";
};
sourceRoot = ".";

9
pkgs/development/libraries/thrift/default.nix
View File

@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "thrift";
version = "0.16.0";
version = "0.17.0";
src = fetchurl {
url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-9GC1wcow2JGP+V6j62KRs5Uc9RhVNWYIjz8r6JgfYgk=";
hash = "sha256-snLBeIuxZdmVIaJZmzG5f6aeWTHQmQFdka4QegsMxY8=";
};
# Workaround to make the Python wrapper not drop this package:
@ -61,11 +61,6 @@ stdenv.mkDerivation rec {
# ToStringTest.cpp is failing from some reason due to locale issue, this
# doesn't disable all UnitTests as in Darwin.
./disable-failing-test.patch
(fetchpatch {
name = "tests-expired-certs.diff"; # https://github.com/apache/thrift/pull/2629
url = "https://github.com/apache/thrift/commit/54765854873e19b8ba50a0ec8080dd92d8323851.diff";
sha256 = "wnG2MjY0DtAhVcEdcxu77tDa4T9Xm2pMYZU2wXLx2OA=";
})
(fetchpatch {
name = "setuptools-gte-62.1.0.patch"; # https://github.com/apache/thrift/pull/2635
url = "https://github.com/apache/thrift/commit/c41ad9d5119e9bdae1746167e77e224f390f2c42.diff";

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

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "gspread";
version = "5.5.0";
version = "5.6.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-hiDph+U0AxXyuNjSbPl+RzaoSzMloXx9m8/3BSXcMAM=";
hash = "sha256-n8qFUXP9suZIs9qee7/7g2Ab/XxxMdRPp4HfhMaJ5/w=";
};
propagatedBuildInputs = [

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

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "nbclassic";
version = "0.4.3";
version = "0.4.5";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-8DERss66ppuINwp7I7GbKzfJu3F2fxgozf16BH6ujt0=";
sha256 = "sha256-BXBMbN2DAb9S5A7Z+uOegNa8XS1EfcZ4McFFtN2Sh3k=";
};
propagatedBuildInputs = [ jupyter_server notebook notebook-shim ];

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

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "patsy";
version = "0.5.2";
version = "0.5.3";
src = fetchPypi {
inherit pname version;
sha256 = "5053de7804676aba62783dbb0f23a2b3d74e35e5bfa238b88b7cbf148a38b69d";
sha256 = "sha256-vcGAAYdeMZvJHIEsHrahC+S7E8uB63Y/RmF53KO2cnc=";
};
propagatedBuildInputs = [

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

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "pylsp-mypy";
version = "0.6.2";
version = "0.6.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Richardk2n";
repo = "pylsp-mypy";
rev = "refs/tags/${version}";
sha256 = "sha256-uOfNSdQ1ONybEiYXW6xDHfUH+0HY9bxDlBCNl3xHEn8=";
sha256 = "sha256-fZ2bPPjBK/H2jMI4S3EhvWJaNl4tK7HstxcHSAkoFW4=";
};
disabledTests = [

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

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "PyPDF2";
version = "2.11.0";
version = "2.11.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-2IF2H2xjEJqFkJPJHckKFdAf816s3rkoCTYLliPiw8k=";
sha256 = "sha256-PHut1RLCFxHrF4nC6tv5YnkonA+URS7lSoZHO/vv1zI=";
};
LC_ALL = "en_US.UTF-8";

6
pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
View File

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-tarpaulin";
version = "0.21.0";
version = "0.22.0";
src = fetchFromGitHub {
owner = "xd009642";
repo = "tarpaulin";
rev = version;
sha256 = "sha256-u6HZekrFfL+jqUh7UAo9DbgYxzS/drpt1/WdJqRFFe4=";
sha256 = "sha256-NABmCLEJBt+lpe28pgztMmPFja2httg3THlvk9EMbUI=";
};
nativeBuildInputs = [
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ curl Security ];
cargoSha256 = "sha256-g3PrsyGhBiN32wPtdrIPjnQK79gaJtTfZkwv7MzYYrU=";
cargoSha256 = "sha256-PyY7H7he/LhfhIhZnT13rSc7zNnOWnLMfgwTUfX39bQ=";
#checkFlags = [ "--test-threads" "1" ];
doCheck = false;

4
pkgs/development/tools/continuous-integration/cirrus-cli/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "cirrus-cli";
version = "0.87.1";
version = "0.87.2";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3ZH+oky15SCXdptBbj2UqKC5WZ+a9q05YW9p9Yhrc8A=";
sha256 = "sha256-xw9eqaToasONmkld2EeiykuuVaMG77eGIsx6YDmXKKM=";
};
vendorSha256 = "sha256-HX4seTtO5DWeR1PqXnYKIKq1/wP6/ppTclDpkQSzgbM=";

29
pkgs/tools/misc/twspace-dl/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib, python3Packages, ffmpeg }:
python3Packages.buildPythonApplication rec {
pname = "twspace-dl";
version = "2022.6.6.1";
format = "setuptools";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "47622f306f2601185b00d6ef24f821810adcc581b7361c423eec979263725afc";
};
propagatedBuildInputs = with python3Packages; [
requests
];
makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" ];
pythonImportsCheck = [ "twspace_dl" ];
meta = with lib; {
description = "A python module to download twitter spaces";
homepage = "https://github.com/HoloArchivists/twspace-dl";
license = licenses.gpl2Only;
maintainers = with maintainers; [ marsam ];
mainProgram = "twspace_dl";
};
}

4
pkgs/tools/typesetting/satysfi/default.nix
View File

@ -35,12 +35,12 @@ let
in
stdenv.mkDerivation rec {
pname = "satysfi";
version = "0.0.7";
version = "0.0.8";
src = fetchFromGitHub {
owner = "gfngfn";
repo = "SATySFi";
rev = "v${version}";
sha256 = "sha256-BmnOIplC24JMb0LSgGPh/j01rXvtl0wni3Chb347eR8=";
sha256 = "sha256-cVGe1N3qMlEGAE/jPUji/X3zlijadayka1OL6iFioY4=";
fetchSubmodules = true;
};

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

@ -12060,6 +12060,8 @@ with pkgs;
twitterBootstrap = callPackage ../development/web/twitter-bootstrap {};
twspace-dl = callPackage ../tools/misc/twspace-dl { };
twtxt = python3Packages.callPackage ../applications/networking/twtxt { };
twurl = callPackage ../tools/misc/twurl { };

4
pkgs/top-level/ruby-packages.nix
View File

@ -3038,10 +3038,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1knw2xa3pkfql4np9qazz2mdi1vz21vdsa0wkx648c4ym1p2h8yh";
sha256 = "sha256-AM0pP5ZafGRLF4/+BUsuA6DuNNc4wX2/OsTZeL4p6Io=";
type = "gem";
};
version = "0.16.0";
version = "0.17.0";
};
tilt = {
groups = ["default"];