nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 17:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-07-20 12:01:36 +00:00 committed by GitHub
commit b50c992ed9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 162 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkgs/applications/backup/unifi-protect-backup/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ fetchFromGitHub, python3, lib }:
python3.pkgs.buildPythonApplication rec {
pname = "unifi-protect-backup";
version = "0.7.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "ep1cman";
repo = pname;
rev = "v${version}";
hash = "sha256-HAiyNFWLs1McrlAB48me/iI15LssO8ec7BiWuJbRlbs=";
};
preBuild = ''
sed -i 's_click = "8.0.1"_click = "^8"_' pyproject.toml
sed -i 's_pyunifiprotect = .*_pyunifiprotect = "*"_' pyproject.toml
'';
nativeBuildInputs = with python3.pkgs; [
poetry-core
];
propagatedBuildInputs = with python3.pkgs; [
aiocron
click
pyunifiprotect
];
checkInputs = with python3.pkgs; [
pytestCheckHook
];
meta = with lib; {
description = "Python tool to backup unifi event clips in realtime";
homepage = "https://github.com/ep1cman/unifi-protect-backup";
maintainers = with maintainers; [ ajs124 ];
license = licenses.mit;
};
}

4
pkgs/applications/version-management/git-and-tools/git-machete/default.nix
View File

@ -12,13 +12,13 @@
buildPythonApplication rec {
pname = "git-machete";
version = "3.11.1";
version = "3.11.2";
src = fetchFromGitHub {
owner = "virtuslab";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BhR1dE6+K7UKaCbLmWPtLMyq0oIj/xYenXp5s7kRINc=";
sha256 = "sha256-alSok5/qcAOBUTNlGjeVSEbT4xW+HzPWj59njfXpG6w=";
};
nativeBuildInputs = [ installShellFiles ];

37
pkgs/data/fonts/cardo/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ fetchzip, lib }:
let
version = "1.04";
in
fetchzip {
name = "cardo-${version}";
url = "http://scholarsfonts.net/cardo104.zip";
hash = "sha256-eBK6+VQpreWA7jIneNXOcKFcT+cJzhoQ9XXyq93SZ8M=";
stripRoot = false;
postFetch = ''
mkdir -p $out/share/fonts/truetype
mv $out/*.ttf $out/share/fonts/truetype
rm $out/*.pdf
'';
meta = with lib; {
description = "Cardo is a large Unicode font specifically designed for the needs of classicists, Biblical scholars, medievalists, and linguists";
longDescription = ''
Cardo is a large Unicode font specifically designed for the needs of
classicists, Biblical scholars, medievalists, and linguists. It also
works well for general typesetting in situations where a high-quality Old
Style font is appropriate. Its large character set supports many modern
languages as well as those needed by scholars. Cardo also contains
features that are required for high-quality typography such as ligatures,
text figures (also known as old style numerals), true small capitals and
a variety of punctuation and space characters.
'';
homepage = "http://scholarsfonts.net/cardofnt.html";
license = licenses.ofl;
maintainers = with lib.maintainers; [ kmein ];
platforms = platforms.all;
};
}

65
pkgs/development/libraries/libgit2-glib/default.nix
View File

@ -1,15 +1,56 @@
{ lib, stdenv, fetchurl, gnome, meson, ninja, pkg-config, vala, libssh2
, gtk-doc, gobject-introspection, libgit2, glib, python3 }:
{ stdenv
, lib
, fetchurl
, gnome
, meson
, ninja
, pkg-config
, vala
, libssh2
, gtk-doc
, gobject-introspection
, gi-docgen
, libgit2
, glib
, python3
}:
stdenv.mkDerivation rec {
pname = "libgit2-glib";
version = "1.0.0.1";
version = "1.1.0";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "RgpdaTaVDKCNLYUYv8kMErsYfPbmdN5xX3BV/FgQK1c=";
sha256 = "w43XV12vgUHh5CIzOldfr2XzySEMCOg+mBuI3UG/HvM=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
vala
gtk-doc
gobject-introspection
gi-docgen
];
propagatedBuildInputs = [
# Required by libgit2-glib-1.0.pc
libgit2
glib
];
buildInputs = [
libssh2
python3.pkgs.pygobject3 # this should really be a propagated input of python output
];
mesonFlags = [
"-Dgtk_doc=true"
];
postPatch = ''
for f in meson_vapi_link.py meson_python_compile.py; do
chmod +x $f
@ -24,24 +65,10 @@ stdenv.mkDerivation rec {
};
};
nativeBuildInputs = [
meson ninja pkg-config vala gtk-doc gobject-introspection
];
propagatedBuildInputs = [
# Required by libgit2-glib-1.0.pc
libgit2 glib
];
buildInputs = [
libssh2
python3.pkgs.pygobject3 # this should really be a propagated input of python output
];
meta = with lib; {
description = "A glib wrapper library around the libgit2 git access library";
homepage = "https://wiki.gnome.org/Projects/Libgit2-glib";
license = licenses.lgpl21;
license = licenses.lgpl21Plus;
maintainers = teams.gnome.members;
platforms = platforms.linux;
};

4
pkgs/development/php-packages/composer/default.nix
View File

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
let
pname = "composer";
version = "2.3.7";
version = "2.3.10";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar";
sha256 = "sha256-Py1GeH1RBw+SK/mRqggyRWb3JvGGB2wqXk6LAajqP9A=";
sha256 = "2AgnLyhPqOD4tHBwPhQ4rI82IDC7ydEuKVMCd9dnr/A=";
};
dontUnpack = true;

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

@ -27,7 +27,7 @@
buildPythonPackage rec {
pname = "lektor";
version = "3.3.4";
version = "3.3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -36,7 +36,7 @@ buildPythonPackage rec {
owner = "lektor";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-9Zd+N6FkvRuW7rptWAr3JLIARXwJDcocxAp/ZCTQ3Hw=";
hash = "sha256-i3SuvRREuq0EENDtXjQegdmz30RmH1HVqBwdjq/mkTM=";
};
propagatedBuildInputs = [

4
pkgs/servers/matrix-synapse/default.nix
View File

@ -11,11 +11,11 @@ in
with python3.pkgs;
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.62.0";
version = "1.63.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-14aHO13FCUEq3pwLUDvrI1au6i8Wykhc5d5C3tLpE3g=";
sha256 = "sha256-RiW2D3nkEK4EUiNoYGhkHqtWZfUfXMqFKakTNNmSp3A=";
};
buildInputs = [ openssl ];

14
pkgs/tools/admin/fastlane/Gemfile.lock
View File

@ -8,20 +8,20 @@ GEM
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.603.0)
aws-sdk-core (3.131.2)
aws-partitions (1.608.0)
aws-sdk-core (3.131.3)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.57.0)
aws-sdk-kms (1.58.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.114.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sigv4 (1.5.0)
aws-sigv4 (1.5.1)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
claide (1.1.0)
@ -66,7 +66,7 @@ GEM
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.2.6)
fastlane (2.207.0)
fastlane (2.208.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
@ -106,7 +106,7 @@ GEM
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.24.0)
google-apis-androidpublisher_v3 (0.25.0)
google-apis-core (>= 0.7, < 2.a)
google-apis-core (0.7.0)
addressable (~> 2.5, >= 2.5.1)
@ -121,7 +121,7 @@ GEM
google-apis-core (>= 0.7, < 2.a)
google-apis-playcustomapp_v1 (0.10.0)
google-apis-core (>= 0.7, < 2.a)
google-apis-storage_v1 (0.17.0)
google-apis-storage_v1 (0.18.0)
google-apis-core (>= 0.7, < 2.a)
google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)

28
pkgs/tools/admin/fastlane/gemset.nix
View File

@ -45,10 +45,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1i1ci3jibkqizr2ms31grj0j9ymhfq8rx7dn6nr10x6arv0db31z";
sha256 = "0qym8s8msgpm0ybx34i0nmr8hvmvxn6x785kxymq7cf63hbpf2a0";
type = "gem";
};
version = "1.603.0";
version = "1.608.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@ -56,10 +56,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "164abp3cvmvfa2qsgzbxvkafbhwbgn3qwknp0amwmxw5nwvz8p3s";
sha256 = "1ri89cvl1wj3w64wx6l57fnv3w2mpgn03rfhpn2l7nl5lhn2d5x2";
type = "gem";
};
version = "3.131.2";
version = "3.131.3";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -67,10 +67,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1m8vwm4cakfv3i4f723a6id07myx18fpdbq8ypa2j7r5njwxpmzz";
sha256 = "1p2dbmb1vl8vk2xchrrsp2sxa95ya5w7ll1jlw89yyhls3l2l1ag";
type = "gem";
};
version = "1.57.0";
version = "1.58.0";
};
aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@ -89,10 +89,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z";
sha256 = "1d4bifmll4hrf4gihr5hdvn59wjpz4qpyg5jj95kp17fykzqg36n";
type = "gem";
};
version = "1.5.0";
version = "1.5.1";
};
babosa = {
groups = ["default"];
@ -368,10 +368,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qfjqscldva6njrggs3cyvsdnbcz4rvdi69lp7h5rl74y0mr07ak";
sha256 = "00wv58qhf6kywqzj6ynlgh718h43269c93jfh24h0jknb9gkq8wa";
type = "gem";
};
version = "2.207.0";
version = "2.208.0";
};
gh_inspector = {
groups = ["default"];
@ -389,10 +389,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vswj47jc5k3x8frywsq295wfngfm8rgmb5i8z7bksxlcc4iysag";
sha256 = "0psz3w8c95ashk5hlfvn5l32mg111z7fv07ngvvgm5mkw6wksh4d";
type = "gem";
};
version = "0.24.0";
version = "0.25.0";
};
google-apis-core = {
dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"];
@ -433,10 +433,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19ccrdgb34w49l62p28yy5qrgwgb4wxs9q3mnb2d334q4q3wsk9f";
sha256 = "00jq03n0ff20rv4smjgx7ggv70crh2whpj5p6jmlb41nim267fvz";
type = "gem";
};
version = "0.17.0";
version = "0.18.0";
};
google-cloud-core = {
dependencies = ["google-cloud-env" "google-cloud-errors"];

13
pkgs/tools/misc/mloader/default.nix
View File

@ -1,15 +1,12 @@
{ lib, python3Packages, fetchFromGitHub }:
{ lib, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "mloader";
version = "1.1.8";
version = "1.1.9";
# PyPI tarball doesn't ship requirements.txt
src = fetchFromGitHub {
owner = "hurlenko";
repo = "mloader";
rev = version;
sha256 = "sha256-cZ9jaRrzzc5M7QYGuLxMv1J1mlfp/UEJ4dugTuJIQ/A=";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "81e4dc7117999d502e3345f8e32df8b16cca226b8b508976dde2de81a4cc2b19";
};
propagatedBuildInputs = with python3Packages; [

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

@ -23131,6 +23131,8 @@ with pkgs;
unifi = unifi7;
unifi-protect-backup = callPackage ../applications/backup/unifi-protect-backup { };
unifi-video = callPackage ../servers/unifi-video { };
unpackerr = callPackage ../servers/unpackerr {
@ -26053,6 +26055,8 @@ with pkgs;
cardboard = callPackage ../applications/window-managers/cardboard { };
cardo = callPackage ../data/fonts/cardo { };
cage = callPackage ../applications/window-managers/cage {
wlroots = wlroots_0_14;
};