Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-14 18:01:12 +00:00 committed by GitHub
commit f0bb8c9a78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 106 additions and 55 deletions

View file

@ -13,10 +13,10 @@ py.buildPythonApplication rec {
buildInputs = [ pythonPackages.wrapPython ];
dontConfigure = true;
dontBuild = true;
doCheck = false;
phases = [ "unpackPhase" "patchPhase" "installPhase" ];
unpackPhase = "cp $src pdfdiff.py";
postPatch = ''

View file

@ -89,6 +89,17 @@ let
x86suffix = "38";
homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
};
"21.06.0" = {
major = "21";
minor = "6";
patch = "0";
x64hash = "f3f98c60b0aaac31eb44dc98f22ee7ae7df229c960d5d29785eb5e9554f85f68";
x86hash = "c2d9652ad9488a9ff171e62df8455ebe6890bcfade1cc289893ee35322d9d812";
x64suffix = "28";
x86suffix = "28";
homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
};
};
# Retain attribute-names for abandoned versions of Citrix workspace to

View file

@ -3,27 +3,26 @@ stdenv.mkDerivation rec {
pname = "leo3";
version = "1.2";
jar = fetchurl {
src = fetchurl {
url = "https://github.com/leoprover/Leo-III/releases/download/v${version}/leo3.jar";
sha256 = "1lgwxbr1rnk72rnvc8raq5i1q71ckhn998pwd9xk6zf27wlzijk7";
};
phases=["installPhase" "fixupPhase"];
dontUnpack = true;
installPhase = ''
mkdir -p "$out"/{bin,lib/java/leo3}
cp "${jar}" "$out/lib/java/leo3/leo3.jar"
cp "${src}" "$out/lib/java/leo3/leo3.jar"
echo "#!${runtimeShell}" > "$out/bin/leo3"
echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" >> "$out/bin/leo3"
chmod a+x "$out/bin/leo3"
'';
meta = {
inherit version;
meta = with lib; {
description = "An automated theorem prover for classical higher-order logic with choice";
license = lib.licenses.bsd3;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
license = licenses.bsd3;
maintainers = [maintainers.raskin];
platforms = platforms.linux;
homepage = "https://page.mi.fu-berlin.de/lex/leo3/";
};
}

View file

@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "0ppprhfw06779hz1b10qvq62gsw73shccsav982dyi6xmqb6jqji";
};
phases = [ "installPhase" ];
dontUnpack = true;
buildInputs = [ perlPackages.grepmail mutt ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "bazelisk";
version = "1.9.0";
version = "1.10.0";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
sha256 = "sha256-APHRNCJNQ4cheY+wBB8q4fcOOL6SFeg5SflvnrxjYhI=";
sha256 = "sha256-G2cHKhgsv1fj7eKbADER3R2uXp9DnKevboE7vnO5pDE=";
};
vendorSha256 = "sha256-+B+5GQTEiCwLCoGB5uIIJEWJRjylgt9txcsJCXcOAQs=";
vendorSha256 = "sha256-5qpeAD4VFsR8iJlRiNTncOdq39lq3MU6gSLu3G/BcPU=";
doCheck = false;

View file

@ -39,6 +39,14 @@ let
HOME=. escript bootstrap
'';
patches = []
# Skips test that can write outside the designated tmp directory, potentially resulting in build failures
# due to file ownership issues if ran without sandbox (eg. Mac M1 default). This patch can be Removed when
# rebar3 releases with the following commit:
# https://github.com/erlang/rebar3/commit/11055384dbd5bf7d181bca83a33b0e100275ff21
++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ ./tmp-tests-skip.patch ];
checkPhase = ''
HOME=. escript ./rebar3 ct
'';

View file

@ -0,0 +1,17 @@
diff --git a/test/rebar_file_utils_SUITE.erl b/test/rebar_file_utils_SUITE.erl
index d771a82..05cfbf7 100644
--- a/test/rebar_file_utils_SUITE.erl
+++ b/test/rebar_file_utils_SUITE.erl
@@ -34,13 +34,11 @@
all() ->
[{group, tmpdir},
- {group, reset_dir},
{group, mv},
path_from_ancestor,
canonical_path,
absolute_path,
normalized_path,
- resolve_link,
split_dirname,
mv_warning_is_ignored].

View file

@ -16,6 +16,7 @@
tree-sitter-jsdoc = (builtins.fromJSON (builtins.readFile ./tree-sitter-jsdoc.json));
tree-sitter-json = (builtins.fromJSON (builtins.readFile ./tree-sitter-json.json));
tree-sitter-julia = (builtins.fromJSON (builtins.readFile ./tree-sitter-julia.json));
tree-sitter-latex = (builtins.fromJSON (builtins.readFile ./tree-sitter-latex.json));
tree-sitter-lua = (builtins.fromJSON (builtins.readFile ./tree-sitter-lua.json));
tree-sitter-markdown = (builtins.fromJSON (builtins.readFile ./tree-sitter-markdown.json));
tree-sitter-nix = (builtins.fromJSON (builtins.readFile ./tree-sitter-nix.json));

View file

@ -0,0 +1,10 @@
{
"url": "https://github.com/latex-lsp/tree-sitter-latex",
"rev": "7f720661de5316c0f8fee956526d4002fa1086d8",
"date": "2021-05-11T16:35:53+02:00",
"path": "/nix/store/ssqxahrza89qmb97bxas6dvhbqd7w0dr-tree-sitter-latex",
"sha256": "14jfmbv3czs643bggcsi3pyxhf81jirpvg8hxcbcdx1f3fzhs16m",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}

View file

@ -74,6 +74,10 @@ let
orga = "cstrahan";
repo = "tree-sitter-nix";
};
"tree-sitter-latex" = {
orga = "latex-lsp";
repo = "tree-sitter-latex";
};
"tree-sitter-lua" = {
orga = "nvim-treesitter";
repo = "tree-sitter-lua";

View file

@ -8,6 +8,6 @@ let
in
buildNodejs {
inherit enableNpm;
version = "16.4.2";
sha256 = "048x4vznpi6dai6fripg0yk21kfxm9s2mw7jb0rzisyv5aw8v2dj";
version = "16.5.0";
sha256 = "16dapj5pm2y1m3ldrjjlz8rq9axk85nn316iz02nk6qjs66y6drz";
}

View file

@ -14,13 +14,13 @@ let php-embed = php.override {
};
pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" {
interpreter = pkg.interpreter;
interpreter = pkg.pythonForBuild.interpreter;
path = "plugins/python";
inputs = [ pkg ncurses ];
install = ''
install -Dm644 uwsgidecorators.py $out/${pkg.sitePackages}/uwsgidecorators.py
${pkg.executable} -m compileall $out/${pkg.sitePackages}/
${pkg.executable} -O -m compileall $out/${pkg.sitePackages}/
${pkg.pythonForBuild.executable} -m compileall $out/${pkg.sitePackages}/
${pkg.pythonForBuild.executable} -O -m compileall $out/${pkg.sitePackages}/
'';
};
@ -91,6 +91,13 @@ stdenv.mkDerivation rec {
inherit python2 python3;
};
postPatch = ''
for f in uwsgiconfig.py plugins/*/uwsgiplugin.py; do
substituteInPlace "$f" \
--replace pkg-config "$PKG_CONFIG"
done
'';
configurePhase = ''
export pluginDir=$out/lib/uwsgi
substituteAll ${./nixos.ini} buildconf/nixos.ini

View file

@ -1,23 +1,36 @@
{lib, fetchurl, python2Packages, librsync, gnused }:
{ lib, python3Packages, librsync }:
python2Packages.buildPythonApplication {
name = "rdiff-backup-1.3.3";
let
pypkgs = python3Packages;
src = fetchurl {
url = "mirror://savannah/rdiff-backup/rdiff-backup-1.3.3.tar.gz";
sha256 = "01hcwf5rgqi303fa4kdjkbpa7n8mvvh7h9gpgh2b23nz73k0q0zf";
in
pypkgs.buildPythonApplication rec {
pname = "rdiff-backup";
version = "2.0.5";
src = pypkgs.fetchPypi {
inherit pname version;
sha256 = "sha256-VNFgOOYgFO2RbHHIMDsH0vphpqaAOMoYn8LTFTSw84s=";
};
patches = [ ./fix-librsync-rs_default_strong_len.patch ];
# pkg_resources fails to find the version and then falls back to "DEV"
postPatch = ''
substituteInPlace src/rdiff_backup/Globals.py \
--replace 'version = "DEV"' 'version = "${version}"'
'';
buildInputs = [ librsync gnused ];
buildInputs = [ librsync ];
nativeBuildInputs = with pypkgs; [ setuptools-scm ];
# no tests from pypi
doCheck = false;
meta = {
meta = with lib; {
description = "Backup system trying to combine best a mirror and an incremental backup system";
homepage = "http://rdiff-backup.nongnu.org/";
license = lib.licenses.gpl2;
platforms = lib.platforms.all;
homepage = "https://rdiff-backup.net";
license = licenses.gpl2Only;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all;
};
}

View file

@ -1,20 +0,0 @@
Patch by Roman Tereshonkov and Kari Hautio for rdiff-backup <= 1.2.8 to avoid a build failure with
librsync >= 1.0.0 (which is a security bugfix release). The discussion and solution finding can be
found at https://bugs.launchpad.net/duplicity/+bug/1416344 (for duplicity).
--- rdiff-backup-1.2.8/_librsyncmodule.c 2009-03-16 15:36:21.000000000 +0100
+++ rdiff-backup-1.2.8/_librsyncmodule.c.librsync-1.0.0 2015-03-02 00:54:24.000000000 +0100
@@ -59,8 +59,13 @@
if (sm == NULL) return NULL;
sm->x_attr = NULL;
+#ifdef RS_DEFAULT_STRONG_LEN
sm->sig_job = rs_sig_begin((size_t)blocklen,
(size_t)RS_DEFAULT_STRONG_LEN);
+#else
+ sm->sig_job = rs_sig_begin((size_t)blocklen,
+ (size_t)8, RS_MD4_SIG_MAGIC);
+#endif
return (PyObject*)sm;
}

View file

@ -11,13 +11,13 @@
rustPlatform.buildRustPackage rec {
pname = "starship";
version = "0.55.0";
version = "0.56.0";
src = fetchFromGitHub {
owner = "starship";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zXXjy90oxLO/Ac/TQC4J6rOvha2qGBMv0SAAXvDyITo=";
sha256 = "0wcldggdavmxajq6dkksdacs5f4729yvxvqiyb9vgalv4akik4yj";
};
nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ];
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
done
'';
cargoSha256 = "sha256-TXmV1saqZ/XS4HxKpGXWu3HuoZ3WIptSc8oTNnPCqYE=";
cargoSha256 = "1ligh5mwids7crf2qh657sdij9fcw7pb3w7vqskpvkyk25h2z6r9";
preCheck = ''
HOME=$TMPDIR

View file

@ -3656,7 +3656,7 @@ in
circus = callPackage ../tools/networking/circus { };
citrix_workspace = citrix_workspace_21_03_0;
citrix_workspace = citrix_workspace_21_06_0;
inherit (callPackage ../applications/networking/remote/citrix-workspace { })
citrix_workspace_20_04_0
@ -3666,6 +3666,7 @@ in
citrix_workspace_20_12_0
citrix_workspace_21_01_0
citrix_workspace_21_03_0
citrix_workspace_21_06_0
;
citra = libsForQt5.callPackage ../misc/emulators/citra { };