BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-10-13 06:01:52 +00:00 committed by GitHub
commit 0bb8cb9c7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 85 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/misc/taskwarrior-tui/default.nix
View file

@ -5,19 +5,19 @@
rustPlatform.buildRustPackage rec {
pname = "taskwarrior-tui";
version = "0.13.33";
version = "0.13.34";
src = fetchFromGitHub {
owner = "kdheepak";
repo = "taskwarrior-tui";
rev = "v${version}";
sha256 = "sha256-vKmVScXQLDjhNJEzlhqiyhRZjR26xjrT1LijxzZK8Cg=";
sha256 = "0p0nkqvkir6lriq75ingpfywn2yvyn3l35yxzk4aiq6vr2n7h3mw";
};
# Because there's a test that requires terminal access
doCheck = false;
cargoSha256 = "sha256-0E4nk8WLprumHKQjpdn+U36z7mdgFb7g/i7egLk4Jcs=";
cargoSha256 = "1mzc6rnqcv97dlkl4j4p180f46wlyq45lc6nq7gqw396wc6m04km";
meta = with lib; {
description = "A terminal user interface for taskwarrior ";

89
pkgs/applications/networking/instant-messengers/mirage/default.nix
View file

@ -1,43 +1,74 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub
, qmake, pkg-config, olm, wrapQtAppsHook
, qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qtgraphicaleffects
, python3Packages, pyotherside, libXScrnSaver
{ lib
, stdenv
, mkDerivation
, fetchFromGitHub
, libXScrnSaver
, olm
, pkg-config
, pyotherside
, python3Packages
, qmake
, qtbase
, qtgraphicaleffects
, qtkeychain
, qtmultimedia
, qtquickcontrols2
, wrapQtAppsHook
}:
let
pypkgs = with python3Packages; [
aiofiles filetype matrix-nio appdirs cairosvg
pymediainfo setuptools html-sanitizer mistune blist
pyotherside
];
in
mkDerivation rec {
pname = "mirage";
version = "0.6.4";
version = "0.7.2";
src = fetchFromGitHub {
owner = "mirukana";
repo = pname;
rev = "v${version}";
sha256 = "15x0x2rf4fzsd0zr84fq3j3ddzkgc5il8s54jpxk8wl4ah03g4nv";
sha256 = "sha256-dJS4lAXHHNUEAG75gQaS9+aQTTTj8KHqHjISioynFdY=";
fetchSubmodules = true;
};
nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook python3Packages.wrapPython ];
buildInputs = [
qtbase qtmultimedia
qtquickcontrols2
qtkeychain qtgraphicaleffects
olm pyotherside
libXScrnSaver
nativeBuildInputs = [
pkg-config
python3Packages.wrapPython
qmake
wrapQtAppsHook
];
propagatedBuildInputs = pypkgs;
buildInputs = [
libXScrnSaver
olm
pyotherside
qtbase
qtgraphicaleffects
qtkeychain
qtmultimedia
qtquickcontrols2
] ++ pythonPath;
pythonPath = pypkgs;
pythonPath = with python3Packages; [
aiofiles
appdirs
blist
cairosvg
filetype
html-sanitizer
hsluv
matrix-nio
mistune
plyer
pymediainfo
pyotherside
redbaron
simpleaudio
setuptools
watchgod
];
qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=qtquickcompiler" ];
qmakeFlags = [
"PREFIX=${placeholder "out"}"
"CONFIG+=qtquickcompiler"
];
dontWrapQtApps = true;
postInstall = ''
@ -45,14 +76,14 @@ mkDerivation rec {
wrapProgram $out/bin/mirage \
--prefix PYTHONPATH : "$PYTHONPATH" \
"''${qtWrapperArgs[@]}"
'';
'';
meta = with lib; {
description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication";
homepage = "https://github.com/mirukana/mirage";
license = licenses.lgpl3;
maintainers = with maintainers; [ colemickens ];
broken = stdenv.isDarwin;
description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ colemickens AndersonTorres ];
inherit (qtbase.meta) platforms;
broken = stdenv.isDarwin;
};
}

4
pkgs/applications/science/robotics/mavproxy/default.nix
View file

@ -3,11 +3,11 @@
buildPythonApplication rec {
pname = "MAVProxy";
version = "1.8.44";
version = "1.8.45";
src = fetchPypi {
inherit pname version;
sha256 = "104000a0e57ef4591bdf28addf8057339b22cbff9501ba92b9b1720d0b2b7325";
sha256 = "f1010cefb5b97a5d392d32aa1425bdb7df995161125f8686f2c7383c2a86e9e5";
};
postPatch = ''

4
pkgs/development/compilers/go/1.16.nix
View file

@ -51,11 +51,11 @@ in
stdenv.mkDerivation rec {
pname = "go";
version = "1.16.8";
version = "1.16.9";
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "sha256-jyqMJLeTN1syQ9+C/bDIOHSG3MioksocmRqpms4Ia5g=";
sha256 = "sha256-ChzH/XvSBEj3Hr7WTYRhOIUNUJmxjPXMEKT8RRYNjD0=";
};
# perl is used for testing go vet

4
pkgs/development/compilers/go/1.17.nix
View file

@ -50,11 +50,11 @@ in
stdenv.mkDerivation rec {
pname = "go";
version = "1.17.1";
version = "1.17.2";
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "sha256-SdwIM5dwrNVhMxLbjBQer2F3mZVXe4nZO1Qe+DBn5bE=";
sha256 = "sha256-IlXrPk6CTdfV/Nwuf4RTQ3HBhjEuVG+xCGo0wXdS9DE=";
};
# perl is used for testing go vet

47
pkgs/development/ocaml-modules/uunf/default.nix
View file

@ -1,50 +1,24 @@
{ lib, stdenv, fetchurl, unzip, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner, uucd }:
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner }:
let
pname = "uunf";
webpage = "https://erratique.ch/software/${pname}";
version = "13.0.0";
ucdxml = fetchurl {
url = "http://www.unicode.org/Public/${version}/ucdxml/ucd.all.grouped.zip";
sha256 = "04gpl09ggb6fb0kmk6298rd8184dv6vcscn28l1gpdv1yjlw1a8q";
};
gen = fetchurl {
url = "https://raw.githubusercontent.com/dbuenzli/uunf/v12.0.0/support/gen.ml";
sha256 = "08j2mpi7j6q3rqc6bcdwspqn1s7pkkphznxfdycqjv4h9yaqsymj";
};
gen_norm = fetchurl {
url = "https://raw.githubusercontent.com/dbuenzli/uunf/v12.0.0/support/gen_norm.ml";
sha256 = "11vx5l5bag6bja7qj8jv4s2x9fknj3557n0mj87k2apq5gs5f4m5";
};
gen_props = fetchurl {
url = "https://raw.githubusercontent.com/dbuenzli/uunf/v12.0.0/support/gen_props.ml";
sha256 = "0a6lhja498kp9lxql0pbfvkgvajs10wx88wkqc7y5m3lrvw46268";
};
version = "14.0.0";
in
assert lib.versionAtLeast ocaml.version "4.03";
if !lib.versionAtLeast ocaml.version "4.03"
then throw "${pname} is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation {
name = "ocaml-${pname}-${version}";
name = "ocaml${ocaml.version}-${pname}-${version}";
inherit version;
src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
sha256 = "1qci04nkp24kdls1z4s8kz5dzgky4nwd5r8345nwdrgwmxhw7ksm";
sha256 = "sha256:17wv0nm3vvwcbzb1b09akw8jblmigyhbfmh1sy9lkb5756ni94a2";
};
postConfigure = ''
rm -f src/uunf_data.ml
mkdir -p support/
cp ${gen} support/gen.ml
cp ${gen_norm} support/gen_norm.ml
cp ${gen_props} support/gen_props.ml
funzip ${ucdxml} > support/ucd.xml
ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/build_support.ml
'';
nativeBuildInputs = [ unzip ];
buildInputs = [ ocaml findlib ocamlbuild topkg uutf cmdliner uucd ];
buildInputs = [ ocaml findlib ocamlbuild topkg uutf cmdliner ];
propagatedBuildInputs = [ uchar ];
@ -53,11 +27,8 @@ stdenv.mkDerivation {
meta = with lib; {
description = "An OCaml module for normalizing Unicode text";
homepage = webpage;
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
# See https://github.com/dbuenzli/uunf/issues/15#issuecomment-903151264
broken = lib.versions.majorMinor ocaml.version == "4.08"
&& stdenv.hostPlatform.isAarch64;
};
}

1
pkgs/development/web/nodejs/nodejs.nix
View file

@ -139,6 +139,7 @@ in
meta = {
description = "Event-driven I/O framework for the V8 JavaScript engine";
homepage = "https://nodejs.org";
changelog = "https://github.com/nodejs/node/blob/v${version}/doc/changelogs/CHANGELOG_V${majorVersion}.md#${version}";
license = licenses.mit;
maintainers = with maintainers; [ goibhniu gilligan cko marsam ];
platforms = platforms.linux ++ platforms.darwin;

4
pkgs/development/web/nodejs/v12.nix
View file

@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "12.22.6";
sha256 = "0yhgkcp7lx5nglxsrybbjymx1fys3wkbbhkj6h6652gnp0b2y0n2";
version = "12.22.7";
sha256 = "0sszg3k5jd26hymqhs5328kvnxsb3x78sg4gpna9lrvh92s26snc";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}

4
pkgs/development/web/nodejs/v16.nix
View file

@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "16.11.0";
sha256 = "1bk5f47hm409129w437h8qdvmqjdr11awblvnhkfsp911nyk3xnk";
version = "16.11.1";
sha256 = "0y32mdv8zs35la2bny8d9rxjvj1vr8z079ji1g6ajc2yw96pyn37";
patches = [ ./disable-darwin-v8-system-instrumentation.patch ];
}

4
pkgs/tools/networking/ytcc/default.nix
View file

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "ytcc";
version = "2.4.2";
version = "2.5.0";
src = fetchFromGitHub {
owner = "woefe";
repo = "ytcc";
rev = "v${version}";
sha256 = "013dhw7kn1s3r6w7kfvhqh0l74kgijfni47l71p7wicg3hzhm3mr";
sha256 = "0d5zlj5c9n8kq38sq2napc2pnqq866v8jpsyg07q5yjcjwlmihap";
};
nativeBuildInputs = [ gettext ];