b12f/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:
Frederik Rietdijk 2022-09-12 19:03:50 +02:00
parent 9eeed94d3e 5f326e2a40
commit 4e62b94df3
24 changed files with 107 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
maintainers/maintainer-list.nix
View file

@ -10971,6 +10971,13 @@
githubId = 314564;
name = "Ryan Lahfa";
};
raphaelr = {
email = "raphael-git@tapesoftware.net";
matrix = "@raphi:tapesoftware.net";
github = "raphaelr";
githubId = 121178;
name = "Raphael Robatsch";
};
raquelgb = {
email = "raquel.garcia.bautista@gmail.com";
github = "raquelgb";

2
nixos/modules/services/misc/paperless.nix
View file

@ -282,7 +282,7 @@ in
serviceConfig = defaultServiceConfig // {
User = cfg.user;
ExecStart = ''
${pkgs.python3Packages.gunicorn}/bin/gunicorn \
${pkg.python.pkgs.gunicorn}/bin/gunicorn \
-c ${pkg}/lib/paperless-ngx/gunicorn.conf.py paperless.asgi:application
'';
Restart = "on-failure";

6
pkgs/applications/blockchains/alfis/default.nix
View file

@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "alfis";
version = "0.7.7";
version = "0.8.2";
src = fetchFromGitHub {
owner = "Revertron";
repo = "Alfis";
rev = "v${version}";
sha256 = "sha256-I9vJc3J3OoUA6GOc8NkWBKSCkjHC4KOztglJOg9S0Eo=";
sha256 = "sha256-E0n1keNk5jNnErNvYhb8oe26kK9Opl+IJ5zpsvrqS84=";
};
cargoSha256 = "sha256-VVBO2w6iwZ+K4gnN6+TckgBXCCc/dGO6/yZEunWGK8g=";
cargoSha256 = "sha256-kbo3OMLYA/5xctz/YhQNd8IYlyCQB7D/8rCHZwjvlMI=";
checkFlags = [
# these want internet access, disable them

4
pkgs/applications/blockchains/ledger-live-desktop/default.nix
View file

@ -2,11 +2,11 @@
let
pname = "ledger-live-desktop";
version = "2.46.2";
version = "2.47.0";
src = fetchurl {
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256-fSfES+6+LCRTLdOy3RJaHzv0zRXkqT+0Rsdt2kSeU18=";
hash = "sha256-KmNiyWF74hHLLu+uQDiFAMJJvyU/rgyrBhh6O6iMVIg=";
};
appimageContents = appimageTools.extractType2 {

12
pkgs/applications/editors/jetbrains/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, callPackage, fetchurl
, jdk, cmake, gdb, zlib, python3
, jdk, cmake, gdb, zlib, python3, icu
, lldb
, dotnet-sdk_6
, maven
@ -211,6 +211,8 @@ let
(mkJetBrainsProduct {
inherit pname version src wmClass jdk;
product = "Rider";
# icu is required by Rider.Backend
extraLdPath = [ icu ];
meta = with lib; {
homepage = "https://www.jetbrains.com/rider/";
inherit description license platforms;
@ -222,13 +224,15 @@ let
apps, services and libraries, Unity games, ASP.NET and
ASP.NET Core web applications.
'';
maintainers = [ ];
maintainers = with maintainers; [ raphaelr ];
};
}).overrideAttrs (attrs: {
postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + ''
interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
patchelf --set-interpreter $interp lib/ReSharperHost/linux-x64/Rider.Backend
rm -rf lib/ReSharperHost/linux-x64/dotnet
mkdir -p lib/ReSharperHost/linux-x64/dotnet/
ln -s ${dotnet-sdk_6}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet
ln -s ${dotnet-sdk_6} lib/ReSharperHost/linux-x64/dotnet
'');
});

12
pkgs/applications/editors/vim/plugins/generated.nix
View file

@ -3392,6 +3392,18 @@ final: prev:
meta.homepage = "https://github.com/neovimhaskell/haskell-vim/";
};
haskell-with-unicode-vim = buildVimPluginFrom2Nix {
pname = "haskell-with-unicode.vim";
version = "2022-09-11";
src = fetchFromGitHub {
owner = "wenzel-hoffman";
repo = "haskell-with-unicode.vim";
rev = "28899d6795efe2feaca6b53c20ec5ef3b5a1b761";
sha256 = "11a3a981x4av2lvknq1xbxbr8ybgazxfikr45qdm1mby6533kx69";
};
meta.homepage = "https://github.com/wenzel-hoffman/haskell-with-unicode.vim/";
};
hasksyn = buildVimPluginFrom2Nix {
pname = "hasksyn";
version = "2014-09-04";

1
pkgs/applications/editors/vim/plugins/vim-plugin-names
View file

@ -284,6 +284,7 @@ https://github.com/junegunn/gv.vim/,,
https://git.sr.ht/~sircmpwn/hare.vim,HEAD,
https://github.com/ThePrimeagen/harpoon/,,
https://github.com/neovimhaskell/haskell-vim/,,
https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD,
https://github.com/travitch/hasksyn/,,
https://github.com/Yggdroot/hiPairs/,,
https://github.com/mpickering/hlint-refactor-vim/,,

12
pkgs/applications/misc/mpvc/default.nix
View file

@ -1,14 +1,14 @@
{ lib, stdenv, socat, fetchFromGitHub, makeWrapper }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "mpvc";
version = "unstable-2017-03-18";
version = "1.3";
src = fetchFromGitHub {
owner = "wildefyr";
owner = "lwilletts";
repo = "mpvc";
rev = "aea5c661455248cde7ac9ddba5f63cc790d26512";
sha256 = "0qiyvb3ck1wyd3izajwvlq4bwgsbq7x8ya3fgi5i0g2qr39a1qml";
rev = version;
sha256 = "sha256-wPETEG0BtNBEj3ZyP70byLzIP+NMUKbnjQ+kdvrvK3s=";
};
makeFlags = [ "PREFIX=$(out)" ];
@ -23,7 +23,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "A mpc-like control interface for mpv";
homepage = "https://github.com/wildefyr/mpvc";
homepage = "https://github.com/lwilletts/mpvc";
license = licenses.mit;
maintainers = [ maintainers.neeasade ];
platforms = platforms.linux;

6
pkgs/applications/misc/xplr/default.nix
View file

@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "xplr";
version = "0.19.0";
version = "0.19.3";
src = fetchFromGitHub {
owner = "sayanarijit";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rvqx0s56VozG8M0m3uZsHuugx0BXucSFqLbq0L1KhAM=";
sha256 = "sha256-0aNtBf3np9cq9JTgHRWy73i4AKaVEOluhSMSUyobduI=";
};
buildInputs = lib.optional stdenv.isDarwin libiconv;
cargoSha256 = "sha256-CyHkjXZVISkQJEQx5vNBGBf6zZrVv/cLWIYeOq9Ac5k=";
cargoSha256 = "sha256-DXPpW7vls4yDEMiRrqDndxEKSA7Uncrt6n8nmsBXHcU=";
meta = with lib; {
description = "A hackable, minimal, fast TUI file explorer";

8
pkgs/applications/networking/cluster/fluxcd/default.nix
View file

@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:
let
version = "0.33.0";
sha256 = "1rrx2sq9wap7xzvqa6dw54kmmlnj4d45y8ziaxkyibz7hsqvzyqk";
manifestsSha256 = "0zzv5mkcnxcrd6yq330bm4b1bvlp93qv80n4yb4y7g16d0a2xp9a";
version = "0.34.0";
sha256 = "1znxhjqvch0z0s98v3hvvh1pa3nlv0l6qhlm0f61z64srz3i5d1k";
manifestsSha256 = "1fchzr7fb894hdya9bbh59avqsa66wcz06fck60wmwpc93m64cqs";
manifests = fetchzip {
url =
@ -23,7 +23,7 @@ in buildGoModule rec {
inherit sha256;
};
vendorSha256 = "sha256-jKluPTBg7wVbbApKul/68qC1xoMyp86/ok2UZLAoRUY=";
vendorSha256 = "sha256-0oHcitczG+sW9mkwxY6hCdR2ASpat2XQ+IsLAiqCUb8=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests

13
pkgs/applications/office/paperless-ngx/default.nix
View file

@ -3,7 +3,7 @@
, nixosTests
, python3
, ghostscript
, imagemagick
, imagemagickBig
, jbig2enc
, optipng
, pngquant
@ -49,7 +49,16 @@ let
};
};
path = lib.makeBinPath [ ghostscript imagemagick jbig2enc optipng pngquant qpdf tesseract4 unpaper ];
path = lib.makeBinPath [
ghostscript
imagemagickBig
jbig2enc
optipng
pngquant
qpdf
tesseract4
unpaper
];
in
python.pkgs.pythonPackages.buildPythonApplication rec {
pname = "paperless-ngx";

19
pkgs/applications/version-management/got/default.nix
View file

@ -1,19 +1,28 @@
{ lib, stdenv, fetchurl, pkg-config, openssl, libbsd, libuuid, libossp_uuid, libmd, zlib, ncurses }:
{ lib, stdenv, fetchurl
, pkg-config, openssl, libbsd, libevent, libuuid, libossp_uuid, libmd, zlib, ncurses, bison
}:
stdenv.mkDerivation rec {
pname = "got";
version = "0.74";
version = "0.75";
src = fetchurl {
url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz";
sha256 = "sha256-XElSCdFh24rf2gosjS0BG+VNqLZNLYeYkUy4t5RIdv4=";
sha256 = "sha256-s1MkiTya771r9JYCpsm7nW4gZwr/PJc0/v6tAgW7nLI=";
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config bison ];
buildInputs = [ openssl libbsd libuuid libmd zlib ncurses ]
buildInputs = [ openssl libbsd libevent libuuid libmd zlib ncurses ]
++ lib.optionals stdenv.isDarwin [ libossp_uuid ];
preConfigure = lib.optionals stdenv.isDarwin ''
# The configure script assumes dependencies on Darwin are install via
# Homebrew or MacPorts and hardcodes assumptions about the paths of
# dependencies which fails the nixpkgs configurePhase.
substituteInPlace configure --replace 'xdarwin' 'xhomebrew'
'';
doInstallCheck = true;
installCheckPhase = ''

4
pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "sierra-breeze-enhanced";
version = "1.2.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "kupiqu";
repo = "SierraBreezeEnhanced";
rev = "V${version}";
sha256 = "sha256-Tzd8ATdmOjVe8OCSdcB9h7r6sqtb+24Fq80t/hmGJcE=";
sha256 = "sha256-x3OTLH8gcWrqpFGQPZHwvyPFwLhEGeHhU4cRqvtPupQ=";
};
nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];

4
pkgs/development/libraries/libjcat/default.nix
View file

@ -19,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "libjcat";
version = "0.1.11";
version = "0.1.12";
outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ];
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "hughsie";
repo = "libjcat";
rev = version;
sha256 = "2kdoOwgaLpo/Cp3wkCMgdyQ++BC3Cn7CRhXhVCHn/iM=";
sha256 = "sha256-9+wtCJzvT9uAXRXj/koFG7asxm5JIDw0Ffp4wK6tbDk=";
};
patches = [

4
pkgs/development/libraries/libxmlb/default.nix
View file

@ -17,7 +17,7 @@
stdenv.mkDerivation rec {
pname = "libxmlb";
version = "0.3.9";
version = "0.3.10";
outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ];
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
owner = "hughsie";
repo = "libxmlb";
rev = version;
sha256 = "sha256-4WTuwxpIsE7gHXFiuWuZeu2JMGzPLpsmS1KTEdR3ztg=";
sha256 = "sha256-uitnVqR2VVNAf8H1Q/u6LezhvfQJ/G2bE0Dv9dyP8+A=";
};
patches = [

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "flake8-bugbear";
version = "22.8.23";
version = "22.9.11";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "PyCQA";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-5SBG/lrbe25kcABngDpOdjA/JJQ0DKcCYi6JBxTurPg=";
hash = "sha256-f95mwHjWoCRjAc8djrHm57q32hyp8Ukg7d2hSNlLvXs=";
};
propagatedBuildInputs = [

6
pkgs/development/tools/cocogitto/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cocogitto";
version = "5.1.0";
version = "5.2.0";
src = fetchFromGitHub {
owner = "oknozor";
repo = pname;
rev = version;
sha256 = "sha256-q2WJKAXpIO+VsOFrjdyEx06yis8f2SkCuB0blUgqq0M=";
sha256 = "sha256-ZjDZMI84z8riRtidZVeCktwJUMkZU28E23MveJSD7xY=";
};
cargoSha256 = "sha256-UArYBcUkXPYlNRLQBMwNhsd3bNgLeEwtJdzepMTt2no=";
cargoSha256 = "sha256-oaWWAVTKxrshfvqE+HMQ1WeeEz8lOE7qc6RrgSjDtdU=";
# Test depend on git configuration that would likly exist in a normal user enviroment
# and might be failing to create the test repository it works in.

6
pkgs/development/tools/jql/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "jql";
version = "5.0.1";
version = "5.0.2";
src = fetchFromGitHub {
owner = "yamafaktory";
repo = pname;
rev = "v${version}";
sha256 = "sha256-UfVhkwb89OU7yENcCXM7JfYNsO//des0gsEnvnJGMjA=";
sha256 = "sha256-bCq8EUczhBx/txafdJvTKqbJoZaGZlrdl87TQt8iMDM=";
};
cargoSha256 = "sha256-kkWslFEdjsWGIrRWylGyTDZnNXcfCVrWT+dVnyvTRqk=";
cargoSha256 = "sha256-V+fzGg0MOCG8ikuiFtN3k6825QXRfBRpUKfdTjQVChM=";
meta = with lib; {
description = "A JSON Query Language CLI tool built with Rust";

6
pkgs/development/tools/just/default.nix
View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "just";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = version;
sha256 = "sha256-LDLxPNLUyDmJgnoFMMt82pt7J2qf/cBQilcCLk7xNUI=";
hash = "sha256-x/4+5m/FiqH68xTHP/cyPDbQ1DtpBXJr32iTq/9GWwI=";
};
cargoSha256 = "sha256-Gg0KaFTTsBH55VyYnIA0ZHy5l55tp9xodv0zBgHdLic=";
cargoSha256 = "sha256-EjX2U+H8sw+v+NEa5uCxIqG8HDl2P6PjpvWrhuF9Jr0=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

6
pkgs/development/tools/mani/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "mani";
version = "0.21.0";
version = "0.22.0";
src = fetchFromGitHub {
owner = "alajmo";
repo = "mani";
rev = "v${version}";
sha256 = "sha256-eH6V7J0KHGyR//kVr0dOdBYuoR3FDbW/pSh0RhHd4A8=";
sha256 = "sha256-2WuUQt9q19JYlfAyoGFRVpiLmsMbN45cYdF16j+jhhk=";
};
vendorSha256 = "sha256-g336is8Jjbbzmtsu3suhO9SNq3IJyy1MQ3s8P39MhvU=";
vendorSha256 = "sha256-9DP6SRcvHtZhkk2XoYesC1mhfq06KsLs0X02AG9vwJ8=";
nativeBuildInputs = [ installShellFiles makeWrapper ];

4
pkgs/shells/zsh/pure-prompt/default.nix
View file

@ -4,13 +4,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "pure-prompt";
version = "1.20.1";
version = "1.20.3";
src = fetchFromGitHub {
owner = "sindresorhus";
repo = "pure";
rev = "v${version}";
sha256 = "sha256-iuLi0o++e0PqK81AKWfIbCV0CTIxq2Oki6U2oEYsr68=";
sha256 = "sha256-vFms0MaSiLEzlYdgmUPGXaApTHVSVhwbw11N4GucgLg=";
};
strictDeps = true;

9
pkgs/tools/backup/borgmatic/default.nix
View file

@ -1,4 +1,4 @@
{ borgbackup, coreutils, lib, python3Packages, systemd }:
{ borgbackup, coreutils, lib, python3Packages, systemd, installShellFiles, borgmatic, testers }:
python3Packages.buildPythonApplication rec {
pname = "borgmatic";
@ -17,6 +17,8 @@ python3Packages.buildPythonApplication rec {
"test_borgmatic_version_matches_news_version"
];
nativeBuildInputs = [ installShellFiles ];
propagatedBuildInputs = with python3Packages; [
borgbackup
colorama
@ -27,6 +29,9 @@ python3Packages.buildPythonApplication rec {
];
postInstall = ''
installShellCompletion --cmd borgmatic \
--bash <($out/bin/borgmatic --bash-completion)
mkdir -p $out/lib/systemd/system
cp sample/systemd/borgmatic.timer $out/lib/systemd/system/
substitute sample/systemd/borgmatic.service \
@ -36,6 +41,8 @@ python3Packages.buildPythonApplication rec {
--replace sleep ${coreutils}/bin/sleep
'';
passthru.tests.version = testers.testVersion { package = borgmatic; };
meta = with lib; {
description = "Simple, configuration-driven backup software for servers and workstations";
homepage = "https://torsion.org/borgmatic/";

4
pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "ibus-m17n";
version = "1.4.10";
version = "1.4.11";
src = fetchFromGitHub {
owner = "ibus";
repo = "ibus-m17n";
rev = version;
sha256 = "sha256-OYWEYi2KVzGR+DS1cWMJFexuEwBQfqC+T3cVJF+glXg=";
sha256 = "sha256-y9cWQ6Z7sxGCdRgWRoKPGH3TDWyrzCwXDEx0pfTjgyM=";
};
nativeBuildInputs = [

6
pkgs/tools/misc/tere/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tere";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "mgunyho";
repo = "tere";
rev = "v${version}";
sha256 = "BD7onBkFyo/JAw/neqL9N9nBYSxoMrmaG6egeznV9Xs=";
sha256 = "sha256-2DpJYOzswT7dHEIj+qaTx1Jm28NE+61opoxuMChNwbM=";
};
cargoSha256 = "gAq9ULQ2YFPmn4IsHaYrC0L7NqbPUWqXSb45ZjlMXEs=";
cargoSha256 = "sha256-8qSikfsHX8xwBqSSxWwNbiOpXmfzwGTAOALPjxVHadc=";
# This test confirmed not working.
# https://github.com/mgunyho/tere/issues/44