Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2020-12-07 00:39:47 +00:00 committed by GitHub
commit e7e56512fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 1429 additions and 1091 deletions

View file

@ -32,6 +32,11 @@ mkDerivation rec {
url = "https://github.com/falkTX/Cadence/commit/1fd3275e7daf4b75f59ef1f85a9e2e93bd5c0731.patch";
sha256 = "0q791jsh8vmjg678dzhbp1ykq8xrrlxl1mbgs3g8if1ccj210vd8";
})
# Fix build with Qt 5.15
(fetchpatch {
url = "https://github.com/falkTX/Cadence/commit/c167f35fbb76c4246c730b29262a59da73010412.patch";
sha256 = "1gm9q6gx03sla5vcnisznc95pjdi2703f8b3mj2kby9rfx2pylyh";
})
];
postPatch = ''
@ -96,7 +101,5 @@ mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [ worldofpeace ];
platforms = [ "x86_64-linux" ];
# Needs QT 5.14
broken = true;
};
}

View file

@ -27,7 +27,7 @@ rec {
meta = {
description = "A web browser built from Firefox source tree";
homepage = "http://www.mozilla.com/en-US/firefox/";
maintainers = with lib.maintainers; [ eelco andir ];
maintainers = with lib.maintainers; [ eelco ];
platforms = lib.platforms.unix;
badPlatforms = lib.platforms.darwin;
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
@ -51,7 +51,7 @@ rec {
meta = {
description = "A web browser built from Firefox Extended Support Release source tree";
homepage = "http://www.mozilla.com/en-US/firefox/";
maintainers = with lib.maintainers; [ eelco andir ];
maintainers = with lib.maintainers; [ eelco ];
platforms = lib.platforms.unix;
badPlatforms = lib.platforms.darwin;
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".

View file

@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
license = with licenses; [ asl20 ];
homepage = "https://github.com/googleapis/google-cloud-cpp";
description = "C++ Idiomatic Clients for Google Cloud Platform services";
maintainers = with maintainers; [ andir ];
maintainers = with maintainers; [ ];
broken = true; # Broken on Hydra since 2020-05-19
};
}

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "neatvnc";
version = "0.3.2";
version = "0.4.0";
src = fetchFromGitHub {
owner = "any1";
repo = pname;
rev = "v${version}";
sha256 = "1h9yc3krhjlyapsjaf6y76546rkqk7ygcjfgm0a9bc0cfvmlb5az";
sha256 = "1wpq1vyjqra877vwc3n4i0c1dyhmabyn993cslf1k142ikyc0a8w";
};
nativeBuildInputs = [ meson pkg-config ninja ];

View file

@ -2,14 +2,14 @@
with stdenv.lib;
let version = "2.5.3";
let version = "2.5.4";
in stdenv.mkDerivation {
pname = "magma";
inherit version;
src = fetchurl {
url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz";
sha256 = "1xjy3irdx0w1zyhvn4x47zni5fwsh6z97xd4yqldz8zrm5lx40n6";
sha256 = "0rrvd21hczxlm8awc9z54fj7iqpjmsb518fy32s6ghz0g90znd3p";
name = "magma-${version}.tar.gz";
};

View file

@ -79,6 +79,7 @@
, "expo-cli"
, {"fast-cli": "1.x"}
, "fauna-shell"
, "fixjson"
, "fkill-cli"
, "flood"
, "forever"

File diff suppressed because it is too large Load diff

View file

@ -1,18 +1,25 @@
{ lib, fetchFromGitHub, buildDunePackage, markup }:
{ lib, fetchFromGitHub, buildDunePackage, ocaml, markup, ounit2 }:
buildDunePackage rec {
pname = "lambdasoup";
version = "0.7.1";
version = "0.7.2";
minimumOCamlVersion = "4.02";
useDune2 = true;
src = fetchFromGitHub {
owner = "aantron";
repo = pname;
rev = version;
sha256 = "14lndpsnzjjg58sdwxqpsv7kz77mnwn5658lya9jyaclj8azmaks";
sha256 = "0php51lyz3ll0psazjd59yw02xb9w84150gkyiwmn3fa0iq8nf7m";
};
propagatedBuildInputs = [ markup ];
doCheck = lib.versionAtLeast ocaml.version "4.04";
checkInputs = [ ounit2 ];
meta = {
description = "Functional HTML scraping and rewriting with CSS in OCaml";
homepage = "https://aantron.github.io/lambdasoup/";

View file

@ -1,23 +1,26 @@
{ lib, buildDunePackage, fetchzip, uutf }:
{ lib, buildDunePackage, fetchzip, ocaml, uchar, uutf, ounit2 }:
buildDunePackage rec {
pname = "markup";
version = "0.8.2";
version = "1.0.0";
useDune2 = true;
src = fetchzip {
url = "https://github.com/aantron/markup.ml/archive/${version}.tar.gz";
sha256 = "13zcrwzjmifniv3bvjbkd2ah8wwa3ld75bxh1d8hrzdvfxzh9szn";
};
sha256 = "09hkrf9pw6hpb9j06p5bddklpnjwdjpqza3bx2179l970yl67an9";
};
propagatedBuildInputs = [ uutf ];
propagatedBuildInputs = [ uchar uutf ];
checkInputs = [ ounit2 ];
doCheck = lib.versionAtLeast ocaml.version "4.04";
meta = with lib; {
homepage = "https://github.com/aantron/markup.ml/";
description = "A pair of best-effort parsers implementing the HTML5 and XML specifications";
license = licenses.mit;
maintainers = with maintainers; [
gal_bolle
];
maintainers = with maintainers; [ gal_bolle ];
};
}

View file

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, pkgs, lib, php }:
let
pname = "composer";
version = "2.0.7";
version = "2.0.8";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar";
sha256 = "1sgbawai2jwriyfdlc7xp0qz535hd61xcbsnqiaxwp0xmy60w1ha";
sha256 = "0f0msrqrszhwj7ki9y5wrlwglwanmdcc132l7kz0wvj45gaz0890";
};
dontUnpack = true;

View file

@ -2,8 +2,8 @@
buildPecl {
pname = "event";
version = "3.0.0";
sha256 = "1k35qwcf4qz8617b4riy7bp0vna1j3ds0k9j52hlm7qrhww2yxqn";
version = "3.0.1";
sha256 = "12629hi2ddyavzgl5ala53fi8m55l0xsmqsywy040f0grzp9r6rc";
configureFlags = [
"--with-event-libevent-dir=${pkgs.libevent.dev}"

View file

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, pkgs, lib, php }:
let
pname = "psalm";
version = "4.2.1";
version = "4.3.1";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
sha256 = "0g6s3bn8aaggpqjgr0bqchgkgb4my5ksfycyyqy7nrly2bgn1kbz";
sha256 = "1hv9r5m1mdywm7qi9rs9054jp77cpip3jyw048iq3l7s0vpslkc5";
};
phases = [ "installPhase" ];

View file

@ -3,8 +3,8 @@
buildPecl {
pname = "xdebug";
version = "3.0.0";
sha256 = "0qnaqgn2rdjxc70lyrm3nmy7cfma69c7zn6if23hhkhx5kl0fl44";
version = "3.0.1";
sha256 = "1da983crnk7ci3hfvqrb4gn9w364zzyi147wl4yly9d2adqk358b";
doCheck = true;
checkTarget = "test";

View file

@ -0,0 +1,40 @@
{ stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection,
pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }:
buildPythonPackage rec {
pname = "pygobject";
version = "3.36.1";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0b9CgC0c7BE7Wtqg579/N0W0RSHcIWNYjSdtXNYdcY8=";
};
outputs = [ "out" "dev" ];
mesonFlags = [
"-Dpython=python${if isPy3k then "3" else "2" }"
];
nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ];
buildInputs = [ glib gobject-introspection ]
++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ];
propagatedBuildInputs = [ pycairo cairo ];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "python3.pkgs.${pname}3";
};
};
meta = with stdenv.lib; {
homepage = "https://pygobject.readthedocs.io/";
description = "Python bindings for Glib";
license = licenses.gpl2;
maintainers = with maintainers; [ orivej ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,26 @@
{ lib
, buildPythonPackage
, fetchPypi
, pkgs
}:
buildPythonPackage rec {
pname = "pylibacl";
version = "0.5.4";
src = fetchPypi {
inherit pname version;
sha256 = "0drvxb21y7p0aikcv3jx90vdcjk96kibf9x8qgxic2prxxd3f3q6";
};
# ERROR: testExtended (tests.test_acls.AclExtensions)
# IOError: [Errno 0] Error
doCheck = false;
buildInputs = with pkgs; [ acl ];
meta = {
description = "A Python extension module for POSIX ACLs, it can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them";
license = lib.licenses.lgpl21Plus;
};
}

View file

@ -1,15 +1,19 @@
{ lib, buildPythonPackage, fetchPypi }:
{ lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools_scm }:
buildPythonPackage rec {
pname = "ufonormalizer";
version = "0.4.2";
version = "0.5.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "1rn64a0i151qk6h5f9pijcmja195i2d6f8jbi5h4xkgkinm9wwzj";
sha256 = "1qc3389i2y16n1hjg4dzk821klzjipbh9c9yci70z51pp21mwwh5";
extension = "zip";
};
nativeBuildInputs = [ setuptools_scm ];
meta = with lib; {
description = "Script to normalize the XML and other data inside of a UFO";
homepage = "https://github.com/unified-font-object/ufoNormalizer";

View file

@ -24,6 +24,6 @@ rustPlatform.buildRustPackage rec {
description = "A project for generating C bindings from Rust code";
homepage = "https://github.com/eqrion/cbindgen";
license = licenses.mpl20;
maintainers = with maintainers; [ jtojnar andir ];
maintainers = with maintainers; [ jtojnar ];
};
}

View file

@ -55,7 +55,6 @@ buildPythonApplication rec {
meta = with lib; {
homepage = "https://github.com/kozec/sc-controller";
# donations: https://www.patreon.com/kozec
broken = true;
description = "User-mode driver and GUI for Steam Controller and other controllers";
license = licenses.gpl2;
platforms = platforms.linux;

View file

@ -34,11 +34,15 @@ let
postBuild = ''
files=$(find $out/bin/ -type f -exec readlink -f {} \;)
rm $out/bin
mkdir $out/bin
if [ -L $out/bin ]; then
rm $out/bin
mkdir $out/bin
fi
for i in $files; do
ln -sf $i $out/bin/$(basename $i)
if ! [ "$(readlink -f "$out/bin/$(basename $i)")" = "$i" ]; then
ln -sf $i $out/bin/$(basename $i)
fi
done
wrapProgram $out/bin/pass \

View file

@ -0,0 +1,41 @@
From 611cb2de31a460789c44615d3a52b8d24dbd6fdd Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 4 Dec 2020 21:53:52 +0100
Subject: [PATCH] Fix installation with Nix
---
Makefile | 2 +-
setup.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 2febf4e..8feab91 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ all:
@echo
install:
- @python3 setup.py install --root="$(DESTDIR)" --optimize=1 --skip-build
+ @python3 setup.py install --root="$(DESTDIR)" --optimize=1 --skip-build --prefix=
@echo
@echo "pass-import is installed succesfully"
@echo
diff --git a/setup.py b/setup.py
index b30870c..d9fedbc 100644
--- a/setup.py
+++ b/setup.py
@@ -15,8 +15,8 @@ with Path('pass_import', '__about__.py').open() as file:
with open('README.md') as file:
long_description = file.read()
-share = Path(sys.prefix, 'share')
-lib = Path('/usr', 'lib', 'password-store', 'extensions')
+share = Path('/share')
+lib = Path('/lib', 'password-store', 'extensions')
if '--user' in sys.argv:
lib = Path.home() / '.password-store' / 'extensions'
if 'XDG_DATA_HOME' in os.environ:
--
2.28.0

View file

@ -5,48 +5,38 @@ let
p.defusedxml
p.setuptools
p.pyaml
p.pykeepass
p.filemagic
p.cryptography
p.secretstorage
]);
in stdenv.mkDerivation rec {
pname = "pass-import";
version = "2.6";
version = "3.1";
src = fetchFromGitHub {
owner = "roddhjav";
repo = "pass-import";
rev = "v${version}";
sha256 = "1q8rln4djh2z8j2ycm654df5y6anm5iv2r19spgy07c3fnisxlac";
sha256 = "sha256-nH2xAqWfMT+Brv3z9Aw6nbvYqArEZjpM28rKsRPihqA=";
};
patches = [ ./0001-Fix-installation-with-Nix.patch ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ pythonEnv ];
patches = [
# https://github.com/roddhjav/pass-import/pull/91
(fetchpatch {
url = "https://github.com/roddhjav/pass-import/commit/6ccaf639e92df45bd400503757ae4aa2c5c030d7.patch";
sha256 = "0lw9vqvbqcy96s7v7nz0i1bdx93x7qr13azymqypcdhjwmq9i63h";
})
];
makeFlags = [ "DESTDIR=${placeholder "out"}" ];
postPatch = ''
sed -i -e 's|$0|${pass}/bin/pass|' import.bash
'';
dontBuild = true;
installFlags = [
"PREFIX=$(out)"
"BASHCOMPDIR=$(out)/share/bash-completion/completions"
];
postFixup = ''
install -D pass_import.py $out/${pythonPackages.python.sitePackages}/pass_import.py
postInstall = ''
wrapProgram $out/bin/pimport \
--prefix PATH : "${pythonEnv}/bin" \
--prefix PYTHONPATH : "$out/${pythonPackages.python.sitePackages}"
wrapProgram $out/lib/password-store/extensions/import.bash \
--prefix PATH : "${pythonEnv}/bin" \
--prefix PYTHONPATH : "$out/${pythonPackages.python.sitePackages}" \
--run "export PREFIX"
--prefix PYTHONPATH : "$out/${pythonPackages.python.sitePackages}"
'';
meta = with stdenv.lib; {

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "scdoc";
version = "1.11.0";
version = "1.11.1";
src = fetchurl {
url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz";
sha256 = "17cjh3lcfppyl2mzpanylla93gdgdv5spc8jldshvayzizhfghwa";
sha256 = "007pm3gspvya58cwb12wpnrm9dq5p28max2s0b2y9rq80nqgqag5";
};
postPatch = ''

View file

@ -5154,7 +5154,10 @@ in {
pygobject2 = callPackage ../development/python-modules/pygobject { inherit (pkgs) pkgconfig; };
pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; };
pygobject3 = if isPy3k then
callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; }
else
callPackage ../development/python-modules/pygobject/3.36.nix { inherit (pkgs) meson pkgconfig; };
pygogo = callPackage ../development/python-modules/pygogo { };
@ -5242,7 +5245,10 @@ in {
pylev = callPackage ../development/python-modules/pylev { };
pylibacl = callPackage ../development/python-modules/pylibacl { };
pylibacl = if isPy3k then
callPackage ../development/python-modules/pylibacl { }
else
callPackage ../development/python-modules/pylibacl/0.5.nix { };
pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { };