Merge staging-next into staging

main
github-actions[bot] 2 years ago committed by GitHub
commit 57791f3c03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      pkgs/desktops/gnome/apps/gnome-maps/default.nix
  2. 4
      pkgs/desktops/gnome/core/eog/default.nix
  3. 28
      pkgs/development/python-modules/biliass/default.nix
  4. 8
      pkgs/development/python-modules/miniaudio/default.nix
  5. 17
      pkgs/development/python-modules/ocrmypdf/default.nix
  6. 4
      pkgs/development/python-modules/pikepdf/default.nix
  7. 6
      pkgs/misc/kitty-themes/default.nix
  8. 4
      pkgs/shells/dash/default.nix
  9. 6
      pkgs/tools/admin/eksctl/default.nix
  10. 6
      pkgs/tools/misc/chezmoi/default.nix
  11. 51
      pkgs/tools/misc/yutto/default.nix
  12. 6
      pkgs/tools/networking/snowflake/default.nix
  13. 44
      pkgs/tools/security/passage/default.nix
  14. 6
      pkgs/top-level/all-packages.nix
  15. 8
      pkgs/top-level/python-packages.nix

@ -30,11 +30,11 @@
stdenv.mkDerivation rec {
pname = "gnome-maps";
version = "42.1";
version = "42.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-CC+ElBAf080xvU8a6YgXEOMqUz+y3belcSJ5bJRm0q4=";
sha256 = "sha256-Xm0bDKfMk56pGq39pWM6hl6oX6VlADaGGyv+8L/QabE=";
};
doCheck = true;

@ -29,13 +29,13 @@
stdenv.mkDerivation rec {
pname = "eog";
version = "42.1";
version = "42.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-/LEtXbyFYY3xSzDmMB5eHO+Dgq4nItL1WmQ1Adx8n60=";
sha256 = "sha256-Dk1Kai7hokCui1hEnwK6LGS3+ZSQ0LiRXX9SyQpYBF4=";
};
patches = [

@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, protobuf
}:
buildPythonPackage rec {
pname = "biliass";
version = "1.3.4";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-kktK+6rLwYhkG7LiTBlgBbiIN8apweg4l8pJSTjKQU4=";
};
propagatedBuildInputs = [ protobuf ];
pythonImportsCheck = [ "biliass" ];
meta = with lib; {
homepage = "https://github.com/yutto-dev/biliass";
description = "Convert Bilibili XML/protobuf danmaku to ASS subtitle";
license = licenses.gpl3Only;
maintainers = with maintainers; [ linsui ];
};
}

@ -1,9 +1,12 @@
{ lib
, stdenv
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, cffi
, pytestCheckHook
, AudioToolbox
, CoreAudio
}:
buildPythonPackage rec {
@ -19,6 +22,11 @@ buildPythonPackage rec {
sha256 = "16llwmbbd9445rwhl4v66kf5zd7yl3a94zm9xyllq6ij7vnhg5jb";
};
buildInputs = lib.optionals stdenv.isDarwin [
AudioToolbox
CoreAudio
];
propagatedNativeBuildInputs = [ cffi ];
propagatedBuildInputs = [ cffi ];

@ -2,6 +2,7 @@
, buildPythonPackage
, coloredlogs
, fetchFromGitHub
, fetchpatch
, ghostscript
, img2pdf
, importlib-metadata
@ -18,11 +19,11 @@
, reportlab
, setuptools-scm
, setuptools-scm-git-archive
, stdenv
, substituteAll
, tesseract4
, tqdm
, unpaper
, installShellFiles
}:
buildPythonPackage rec {
@ -35,7 +36,7 @@ buildPythonPackage rec {
rev = "v${version}";
# The content of .git_archival.txt is substituted upon tarball creation,
# which creates indeterminism if master no longer points to the tag.
# See https://github.com/jbarlow83/OCRmyPDF/issues/841
# See https://github.com/ocrmypdf/OCRmyPDF/issues/841
postFetch = ''
rm "$out/.git_archival.txt"
'';
@ -53,11 +54,17 @@ buildPythonPackage rec {
tesseract = "${lib.getBin tesseract4}/bin/tesseract";
unpaper = "${lib.getBin unpaper}/bin/unpaper";
})
# https://github.com/ocrmypdf/OCRmyPDF/pull/973
(fetchpatch {
url = "https://github.com/ocrmypdf/OCRmyPDF/commit/808b24d59f5b541a335006aa6ea7cdc3c991adc0.patch";
hash = "sha256-khsH70fWk5fStf94wcRKKX7cCbgD69LtKkngJIqA3+w=";
})
];
nativeBuildInputs = [
setuptools-scm-git-archive
setuptools-scm
installShellFiles
];
propagatedBuildInputs = [
@ -84,6 +91,12 @@ buildPythonPackage rec {
"ocrmypdf"
];
postInstall = ''
installShellCompletion --cmd ocrmypdf \
--bash misc/completion/ocrmypdf.bash \
--fish misc/completion/ocrmypdf.fish
'';
meta = with lib; {
homepage = "https://github.com/ocrmypdf/OCRmyPDF";
description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched";

@ -51,6 +51,10 @@ buildPythonPackage rec {
})
];
postPatch = ''
sed -i 's|\S*/opt/homebrew.*|pass|' setup.py
'';
SETUPTOOLS_SCM_PRETEND_VERSION = version;
buildInputs = [

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "kitty-themes";
version = "unstable-2022-02-03";
version = "unstable-2022-05-04";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = pname;
rev = "337d6fcb3ad7e38544edfb8d0f6447894b7e5f58";
sha256 = "ZP5GrT2QCdXtC5swqI0SXzIlqIcQNsxBlzEplj/hpz4=";
rev = "fb48041b0ff5ce60e8f10e7067a407ad99a4862e";
sha256 = "/JCLty73YHsTkNxZP6EwhhoiHi2HjtyMZphAPhHe5h0=";
};
installPhase = ''

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "dash";
version = "0.5.11.4";
version = "0.5.11.5";
src = fetchurl {
url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz";
sha256 = "13g06zqfy4n7jkrbb5l1vw0xcnjvq76i16al8fjc5g33afxbf5af";
sha256 = "sha256-23eBEIkfeTeYXym/I0EP4cXWaVAnYPWE5U4OeynhI70=";
};
hardeningDisable = [ "format" ];

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
version = "0.98.0";
version = "0.99.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
sha256 = "sha256-9X7rk8+OSBZME9MsKQiTUVws+QaNSXZrVsZSXTSh4+I=";
sha256 = "sha256-J2d3Uyc/gYciQaZJnOw0piO90ixtqgdnC0gprIoWmvs=";
};
vendorSha256 = "sha256-YdXgfwQaYu/0V/ZO9lfusDdZBh1h26+DsA1HUODsKzU=";
vendorSha256 = "sha256-sRtFfJ7umVK8ruCpZ7TcTVcY9gr3Fldcf3KEdmbgkX4=";
doCheck = false;

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
version = "2.15.2";
version = "2.16.0";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
sha256 = "sha256-zvr1O/HMSoZMtA/+dRO+co8Uy70qV8RPIDK3z8dRD28=";
sha256 = "sha256-J5L4xFdRV8eOJgILQqK0DhvP5/AXAmr7spzokhd4kcg=";
};
vendorSha256 = "sha256-UAjXCXypR1/SIJIZOS53LTyioKrXOECK9vh9t61W5gc=";
vendorSha256 = "sha256-y+xPuW8l3XvpnlqdlNIWdweNXMsAOrwbXHq2cJQRcOY=";
doCheck = false;

@ -0,0 +1,51 @@
{ lib
, buildPythonApplication
, fetchPypi
, pythonOlder
, poetry-core
, aiohttp
, aiofiles
, biliass
, dicttoxml
, colorama
, ffmpeg
, makeWrapper
}:
buildPythonApplication rec {
pname = "yutto";
version = "2.0.0b13";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-XqfbvlaJoRPpwnaUA52KloOsEOIt3YM0cq36DZN6lR8=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
aiofiles
biliass
dicttoxml
colorama
];
preFixup = ''
makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg ]})
'';
pythonImportsCheck = [ "yutto" ];
meta = with lib; {
description = "A Bilibili downloader";
homepage = "https://github.com/yutto-dev/yutto";
license = licenses.gpl3Only;
maintainers = with maintainers; [ linsui ];
};
}

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "snowflake";
version = "2.0.1";
version = "2.2.0";
src = fetchgit {
url = "https://git.torproject.org/pluggable-transports/${pname}";
rev = "v${version}";
hash = "sha256-ULkqsh0DeFI1GsaVaHGSjoEY38EktvDVC52Sx6cQLOE=";
sha256 = "0iazamrfixv6yxc5m49adm97biq93pn6hwwpbh8yq558hrc6bh70";
};
vendorSha256 = "D5A19UHL1WEE1ODT80jKT+PJ5CTXPjc9Eg6v2Nfm4aw=";
vendorSha256 = "1v7cpg3kny0vqmdbgcc7i61wi5gx5wvrv0hmjykjrqgrvyq764c1";
meta = with lib; {
description = "System to defeat internet censorship";

@ -0,0 +1,44 @@
{ lib, stdenv, fetchFromGitHub, makeBinaryWrapper, bash, age, git ? null
, xclip ? null }:
stdenv.mkDerivation {
pname = "passage";
version = "unstable-2022-05-01";
src = fetchFromGitHub {
owner = "FiloSottile";
repo = "passage";
rev = "1262d308f09db9b243513a428ab4b8fb1c30d31d";
sha256 = "1val8wl9kzlxj4i1rrh2iiyf97w9akffvr0idvbkdb09hfzz4lz8";
};
nativeBuildInputs = [ makeBinaryWrapper ];
extraPath = lib.makeBinPath [ age git xclip ];
# Using $0 is bad, it causes --help to mention ".passage-wrapped".
postInstall = ''
substituteInPlace $out/bin/passage --replace 'PROGRAM="''${0##*/}"' 'PROGRAM=passage'
wrapProgram $out/bin/passage --prefix PATH : $extraPath --argv0 $pname
'';
installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ];
meta = with lib; {
description = "Stores, retrieves, generates, and synchronizes passwords securely";
homepage = "https://github.com/FiloSottile/passage";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ kaction ];
platforms = platforms.unix;
longDescription = ''
passage is a fork of password-store (https://www.passwordstore.org) that uses
age (https://age-encryption.org) as a backend instead of GnuPG.
It keeps passwords inside age(1) encrypted files inside a simple
directory tree and provides a series of commands for manipulating the
password store, allowing the user to add, remove, edit and synchronize
passwords.
'';
};
}

@ -2392,6 +2392,8 @@ with pkgs;
pass = callPackage ../tools/security/pass { };
passage = callPackage ../tools/security/passage { };
passphrase2pgp = callPackage ../tools/security/passphrase2pgp { };
pass-git-helper = python3Packages.callPackage ../applications/version-management/git-and-tools/pass-git-helper { };
@ -2671,6 +2673,8 @@ with pkgs;
bicon = callPackage ../applications/misc/bicon { };
biliass = with python3.pkgs; toPythonApplication biliass;
bindfs = callPackage ../tools/filesystems/bindfs { };
binwalk = with python3Packages; toPythonApplication binwalk;
@ -30975,6 +30979,8 @@ with pkgs;
ytmdl = callPackage ../tools/misc/ytmdl { };
yutto = with python3.pkgs; toPythonApplication yutto;
yuview = libsForQt5.yuview;
zam-plugins = callPackage ../applications/audio/zam-plugins { };

@ -1227,6 +1227,8 @@ in {
bids-validator = callPackage ../development/python-modules/bids-validator { };
biliass = callPackage ../development/python-modules/biliass { };
billiard = callPackage ../development/python-modules/billiard { };
bimmer-connected = callPackage ../development/python-modules/bimmer-connected { };
@ -5326,7 +5328,9 @@ in {
minexr = callPackage ../development/python-modules/minexr { };
miniaudio = callPackage ../development/python-modules/miniaudio { };
miniaudio = callPackage ../development/python-modules/miniaudio {
inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox CoreAudio;
};
minidb = callPackage ../development/python-modules/minidb { };
@ -11375,6 +11379,8 @@ in {
yubico-client = callPackage ../development/python-modules/yubico-client { };
yutto = callPackage ../tools/misc/yutto { };
z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { };
z3 = (toPythonModule (pkgs.z3.override {

Loading…
Cancel
Save