Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-09-15 18:01:59 +00:00 committed by GitHub
commit 1c625bf844
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 247 additions and 90 deletions
pkgs
applications
misc/cointop
office/khronos
science
misc/root
physics/xfitter
desktops/gnome/apps/file-roller
development
coq-modules
libraries
python-modules
aioesphomeapi
coqpit
node-semver
snowflake-sqlalchemy
tools
conftest
treefmt
games/tintin
tools
audio/tts
misc/goreleaser
text/hyx
top-level

View file

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "cointop";
version = "1.6.6";
version = "1.6.8";
src = fetchFromGitHub {
owner = "miguelmota";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cn2TtXIxBnEZyWAdtf9ING9I/53z6D8UPVxnFVSkGgo=";
sha256 = "sha256-uENfTj+pJjX4t+yrd7zrn3LHRbJJSZFCN1N6Ce47wcE=";
};
goPackagePath = "github.com/miguelmota/cointop";

View file

@ -9,21 +9,22 @@
, pantheon
, python3
, glib
, gtk3
, gtk4
, json-glib
, libadwaita
, libgee
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "khronos";
version = "1.0.8";
version = "3.5.9";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
sha256 = "0d5ma1d86lh2apagwrwk0d1v1cm3fifjivhf530nlznb67vi1x80";
sha256 = "sha256-3FatmyANB/tNYSN2hu5IVkyCy0YrC3uA2d/3+5u48w8=";
};
nativeBuildInputs = [
@ -38,15 +39,16 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
gtk3
gtk4
json-glib
libadwaita
libgee
pantheon.granite
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
chmod +x build-aux/post_install.py
patchShebangs build-aux/post_install.py
'';
passthru = {
@ -60,6 +62,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/lainsce/khronos";
maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;
platforms = platforms.linux;
license = licenses.gpl3;
license = licenses.gpl3Plus;
};
}

View file

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, makeWrapper
, cmake
, git
@ -15,6 +16,7 @@
, libGLU
, libGL
, libxml2
, llvm_9
, lz4
, xz
, pcre
@ -29,6 +31,7 @@
, libjpeg
, libtiff
, libpng
, tbb
, Cocoa
, CoreSymbolication
, OpenGL
@ -37,11 +40,11 @@
stdenv.mkDerivation rec {
pname = "root";
version = "6.24.02";
version = "6.24.06";
src = fetchurl {
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
sha256 = "sha256-BQfhCV4nnMxyQPZR0llmAkMlF5+oWhJZtpS1ZyOtfBw=";
sha256 = "sha256-kH9p9LrKHk8w7rSXlZjKdZm2qoA8oEboDiW2u6oO9SI=";
};
nativeBuildInputs = [ makeWrapper cmake pkg-config git ];
@ -53,6 +56,7 @@ stdenv.mkDerivation rec {
zlib
zstd
libxml2
llvm_9
lz4
xz
gsl
@ -64,6 +68,7 @@ stdenv.mkDerivation rec {
libpng
nlohmann_json
python.pkgs.numpy
tbb
]
++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ]
@ -71,8 +76,23 @@ stdenv.mkDerivation rec {
patches = [
./sw_vers.patch
# Fix builtin_llvm=OFF support
(fetchpatch {
url = "https://github.com/root-project/root/commit/0cddef5d3562a89fe254e0036bb7d5ca8a5d34d2.diff";
excludes = [ "interpreter/cling/tools/plugins/clad/CMakeLists.txt" ];
sha256 = "sha256-VxWUbxRHB3O6tERFQdbGI7ypDAZD3sjSi+PYfu1OAbM=";
})
];
# Fix build against vanilla LLVM 9
postPatch = ''
sed \
-e '/#include "llvm.*RTDyldObjectLinkingLayer.h"/i#define private protected' \
-e '/#include "llvm.*RTDyldObjectLinkingLayer.h"/a#undef private' \
-i interpreter/cling/lib/Interpreter/IncrementalJIT.h
'';
preConfigure = ''
rm -rf builtins/*
substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \
@ -99,6 +119,7 @@ stdenv.mkDerivation rec {
"-DCMAKE_CXX_STANDARD=17"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DCMAKE_INSTALL_INCLUDEDIR=include"
"-Dbuiltin_llvm=OFF"
"-Dbuiltin_nlohmannjson=OFF"
"-Dbuiltin_openui5=OFF"
"-Dalien=OFF"
@ -112,7 +133,7 @@ stdenv.mkDerivation rec {
"-Dfftw3=OFF"
"-Dfitsio=OFF"
"-Dfortran=OFF"
"-Dimt=OFF"
"-Dimt=ON"
"-Dgfal=OFF"
"-Dgviz=OFF"
"-Dhdfs=OFF"

View file

@ -1,5 +1,6 @@
{ lib, stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, lapack, libyaml, lynx
, mela, root5, qcdnum, which, libtirpc
, memorymappingHook, memstreamHook
}:
stdenv.mkDerivation rec {
@ -36,9 +37,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gfortran which ];
buildInputs =
[ apfel apfelgrid applgrid blas lhapdf lapack mela root5 qcdnum ]
# pdf2yaml requires fmemopen and open_memstream which are not readily available on Darwin
++ lib.optional (!stdenv.isDarwin) libyaml
[ apfel apfelgrid applgrid blas lhapdf libyaml lapack mela root5 qcdnum ]
++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ]
++ lib.optional (stdenv.hostPlatform.libc == "glibc") libtirpc
;
propagatedBuildInputs = [ lynx ];

View file

@ -25,10 +25,11 @@ stdenv.mkDerivation rec {
patchShebangs data/set-mime-type-entry.py
'';
postFixup = ''
preFixup = ''
# Workaround because of https://gitlab.gnome.org/GNOME/file-roller/issues/40
wrapProgram "$out/bin/file-roller" \
gappsWrapperArgs+=(
--prefix PATH : ${lib.makeBinPath [ unzip ]}
)
'';
passthru = {

View file

@ -0,0 +1,19 @@
{ lib, mkCoqDerivation, coq, version ? null }:
with lib;
mkCoqDerivation {
pname = "ceres";
repo = "coq-ceres";
owner = "Lysxia";
inherit version;
defaultVersion = if versions.isGe "8.8" coq.version then "0.4.0" else null;
release."0.4.0".sha256 = "sha256:0zwp3pn6fdj0qdig734zdczrls886al06mxqhhabms0jvvqijmbi";
meta = {
description = "Library for serialization to S-expressions";
license = licenses.mit;
maintainers = with maintainers; [ Zimmi48 ];
};
}

View file

@ -0,0 +1,22 @@
{ lib, mkCoqDerivation, coq, ceres, coq-ext-lib, version ? null }:
with lib;
mkCoqDerivation {
pname = "parsec";
repo = "coq-parsec";
owner = "liyishuai";
propagatedBuildInputs = [ ceres coq-ext-lib ];
releaseRev = (v: "v${v}");
inherit version;
defaultVersion = if versions.isGe "8.12" coq.version then "0.1.0" else null;
release."0.1.0".sha256 = "sha256:01avfcqirz2b9wjzi9iywbhz9szybpnnj3672dgkfsimyg9jgnsr";
meta = {
description = "Library for serialization to S-expressions";
license = licenses.mit;
maintainers = with maintainers; [ Zimmi48 ];
};
}

View file

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "cmark-gfm";
version = "0.29.0.gfm.0";
version = "0.29.0.gfm.1";
src = fetchFromGitHub {
owner = "github";
repo = "cmark-gfm";
rev = version;
sha256 = "0wfr3xwl4wria8vld71flv6vpsdj9aj81yqvj0azidyb8p229a1l";
sha256 = "sha256-GxWA5CjdXPBh1BJzENIijPDCoth0BTNu5ayX0cXT5z0=";
};
nativeBuildInputs = [ cmake ];

View file

@ -0,0 +1,43 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
pname = "memorymapping";
version = "unstable-2014-02-20";
src = fetchFromGitHub {
owner = "NimbusKit";
repo = "memorymapping";
rev = "fc285afe13cb9d56a40c647b8ed6d6bd40636af7";
sha256 = "sha256-9u/QvK9TDsKxcubINH2OAbx5fXXkKF0+YT7LoLDaF0M=";
};
dontConfigure = true;
buildPhase = ''
runHook preBuild
$CC -c src/fmemopen.c
$AR rcs libmemorymapping.a fmemopen.o
sed -e '1i#include <stdio.h>' -i src/fmemopen.h
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -D libmemorymapping.a "$out"/lib/libmemorymapping.a
install -D src/fmemopen.h "$out"/include/fmemopen.h
runHook postInstall
'';
meta = with lib; {
homepage = "https://nimbuskit.github.io/memorymapping/";
description = "fmemopen for Mac OS and iOS";
license = licenses.asl20;
maintainers = with maintainers; [ veprbl ];
platforms = platforms.unix;
broken = stdenv.isAarch64;
};
}

View file

@ -0,0 +1,6 @@
useMemorymapping () {
export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE-}${NIX_CFLAGS_COMPILE:+ }-include fmemopen.h";
export NIX_LDFLAGS="${NIX_LDFLAGS-}${NIX_LDFLAGS:+ }-lmemorymapping";
}
postHooks+=(useMemorymapping)

View file

@ -0,0 +1,43 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "memstream";
version = "0.1";
src = fetchurl {
url = "https://piumarta.com/software/memstream/memstream-${version}.tar.gz";
sha256 = "0kvdb897g7nyviaz72arbqijk2g2wa61cmi3l5yh48rzr49r3a3a";
};
dontConfigure = true;
postBuild = ''
$AR rcs libmemstream.a memstream.o
'';
doCheck = true;
checkPhase = ''
runHook preCheck
./test | grep "This is a test of memstream"
runHook postCheck
'';
installPhase = ''
runHook preInstall
install -D libmemstream.a "$out"/lib/libmemstream.a
install -D memstream.h "$out"/include/memstream.h
runHook postInstall
'';
meta = with lib; {
homepage = "https://www.piumarta.com/software/memstream/";
description = "memstream.c is an implementation of the POSIX function open_memstream() for BSD and BSD-like operating systems";
license = licenses.mit;
maintainers = with maintainers; [ veprbl ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,6 @@
useMemstream () {
export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE-}${NIX_CFLAGS_COMPILE:+ }-include memstream.h";
export NIX_LDFLAGS="${NIX_LDFLAGS-}${NIX_LDFLAGS:+ }-lmemstream";
}
postHooks+=(useMemstream)

View file

@ -1,20 +1,24 @@
{ lib, stdenv, fetchurl, python2 }:
{ lib
, stdenv
, fetchurl
, python
, withPython ? false
}:
stdenv.mkDerivation rec {
pname = "fastjet";
version = "3.3.4";
version = "3.4.0";
src = fetchurl {
url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz";
sha256 = "00zwvmnp2j79z95n9lgnq67q02bqfgirqla8j9y6jd8k3r052as3";
hash = "sha256-7gfIdHyOrYbYjeSp5OjR6efXYUlz9WMbqCl/egJHi5E=";
};
buildInputs = [ python2 ];
buildInputs = lib.optional withPython python;
configureFlags = [
"--enable-allcxxplugins"
"--enable-pyext"
];
] ++ lib.optional withPython "--enable-pyext";
enableParallelBuilding = true;

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "9.0.0";
version = "9.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Z5PebH/x53lo62sHjBH/6H05UhXax3sVfYx5T0uw38s=";
sha256 = "sha256-MuQQ9IpLjsAStpdG8Q0uOzLQl02afStVb52/Rtd+IIs=";
};
propagatedBuildInputs = [

View file

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "coqpit";
version = "0.0.13";
version = "0.0.14";
format = "setuptools";
src = fetchFromGitHub {
owner = "coqui-ai";
repo = pname;
rev = "v${version}";
sha256 = "sha256-YzCO/i0SMyXRAgiZ8Y97bHHuGFeSF8GqUjvNoHLwXZQ=";
sha256 = "041sx7ph8vfx8ivvm6hjj6s83p9lni2agwyrrncqwhcbjy9pbdf1";
};
checkInputs = [

View file

@ -1,14 +1,14 @@
{ lib, fetchPypi, buildPythonPackage, pytest }:
buildPythonPackage rec {
version = "0.7.0";
version = "0.8.1";
pname = "node-semver";
checkInputs = [ pytest ];
src = fetchPypi {
inherit pname version;
sha256 = "1p7ink1wajkc31r05k1yn37gk377033a9vhin8v4j757d4ha1f91";
sha256 = "281600d009606f4f63ddcbe148992e235b39a69937b9c20359e2f4a2adbb1e00";
};
meta = with lib; {

View file

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "snowflake-sqlalchemy";
version = "1.3.1";
version = "1.3.2";
src = fetchPypi {
inherit pname version;
sha256 = "f7c220db11c1abf3df67177fbcf0ea58d33d8531963f2d5df5f09fdac09b912f";
sha256 = "51d9d923ebbfefe392582f6e3d0faa83f52e5eb6f190607820e055318dd2d2f8";
};
propagatedBuildInputs = [

View file

@ -13,16 +13,24 @@ buildGoModule rec {
vendorSha256 = "sha256-jI5bX6S2C0ckiiieVlaRNEsLS/5gGkC3o/xauDtCOjA=";
doCheck = false;
ldflags = [
"-s"
"-w"
"-X github.com/open-policy-agent/conftest/internal/commands.version=${version}"
];
HOME = "$TMPDIR";
doInstallCheck = true;
installCheckPhase = ''
$out/bin/conftest --version | grep ${version} > /dev/null
'';
meta = with lib; {
description = "Write tests against structured configuration data";
downloadPage = "https://github.com/open-policy-agent/conftest";
homepage = "https://www.conftest.dev";
license = licenses.asl20;
longDescription = ''
Conftest helps you write tests against structured configuration data.
Using Conftest you can write tests for your Kubernetes configuration,
@ -33,8 +41,6 @@ buildGoModule rec {
assertions. You can read more about Rego in 'How do I write policies' in
the Open Policy Agent documentation.
'';
inherit (src.meta) homepage;
license = licenses.asl20;
maintainers = with maintainers; [ yurrriq jk ];
maintainers = with maintainers; [ jk superherointj yurrriq ];
};
}

View file

@ -1,16 +1,16 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "treefmt";
version = "0.2.5";
version = "0.2.6";
src = fetchFromGitHub {
owner = "numtide";
repo = "treefmt";
rev = "v${version}";
sha256 = "0h9xl887620d0b4y17nhkayr0raj8b7m6zsgx8gw4v9vdjkjbbpa";
sha256 = "sha256-hnrMy8iYoaeWxZlhO9L1kQW3OgL6jHL1MxJpbNFLHZk=";
};
cargoSha256 = "04zmc2vaxsm4f1baissv3a6hnji3raixg891m3m8l13vin1a884q";
cargoSha256 = "sha256-O7Ma6+Vniil5hIDd5JCWecTvkAjq7wMuuyfrzePDDq4=";
meta = {
description = "one CLI to format the code tree";

View file

@ -1,4 +1,5 @@
{ stdenv, fetchurl, lib, zlib, pcre
, memorymappingHook, memstreamHook
, tlsSupport ? true, gnutls ? null
# ^ set { tlsSupport = false; } to reduce closure size by ~= 18.6 MB
}:
@ -15,7 +16,9 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = lib.optional tlsSupport gnutls.dev;
buildInputs = [ zlib pcre ] ++ lib.optional tlsSupport gnutls;
buildInputs = [ zlib pcre ]
++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ]
++ lib.optional tlsSupport gnutls;
preConfigure = ''
cd src

View file

@ -16,13 +16,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "tts";
version = "0.2.2";
version = "0.3.0";
src = fetchFromGitHub {
owner = "coqui-ai";
repo = "TTS";
rev = "v${version}";
sha256 = "sha256-hhL6/hBs2umR8/VEumr2LzuCAOkroK8vBfDuNVY0ygw=";
sha256 = "sha256-LiH056h7eIaikBr6sm5A4T/lF7nVroxaZSYzrES7+zk=";
};
postPatch = ''
@ -69,7 +69,7 @@ python3.pkgs.buildPythonApplication rec {
cp -r TTS/server/templates/ $out/${python3.sitePackages}/TTS/server
# cython modules are not installed for some reasons
(
cd TTS/tts/layers/glow_tts/monotonic_align
cd TTS/tts/utils/monotonic_align
${python3.interpreter} setup.py install --prefix=$out
)
'';

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
version = "0.176.0";
version = "0.179.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7xqzt/QJOkZLVY3MbBf7QYBrEgO500ft6ahvngaw9rs=";
sha256 = "sha256-E8a1S6CPPd8xsdt/tu1VmWxQCMUp8dEPB5H2IL4jj1k=";
};
vendorSha256 = "sha256-xdK98JWfxvufewcXiMjo6hslFrCbmWrgTAwJM7f00n4=";
vendorSha256 = "sha256-qF7mULIQrFs/SAMm/dUcYPs1urLKKg6w7hgkuJ2AivQ=";
ldflags = [
"-s"

View file

@ -1,11 +1,5 @@
{ lib, stdenv, fetchurl }:
let
# memstream — POSIX memory streams for BSD
memstream = fetchurl {
url = "https://piumarta.com/software/memstream/memstream-0.1.tar.gz";
sha256 = "0kvdb897g7nyviaz72arbqijk2g2wa61cmi3l5yh48rzr49r3a3a";
};
in
{ lib, stdenv, fetchurl, memstreamHook }:
stdenv.mkDerivation rec {
pname = "hyx";
version = "2020-06-09";
@ -15,11 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "1x8dmll93hrnj24kn5knpwj36y6r1v2ygwynpjwrg2hwd4c1a8hi";
};
postUnpack = lib.optionalString stdenv.isDarwin ''
tar --strip=1 -C $sourceRoot -xf ${memstream} --wildcards "memstream-0.1/memstream.[hc]"
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile \
--replace "-Wl,-z,relro,-z,now -fpic -pie" ""
'';
patches = lib.optional stdenv.isDarwin ./memstream.patch;
buildInputs = lib.optional (stdenv.system == "x86_64-darwin") memstreamHook;
installPhase = ''
install -vD hyx $out/bin/hyx

View file

@ -1,31 +0,0 @@
diff -Naur hyx-2020.06.09.org/Makefile hyx-2020.06.09/Makefile
--- hyx-2020.06.09.org/Makefile 2020-06-09 15:19:50.000000000 +0300
+++ hyx-2020.06.09/Makefile 2020-07-22 11:46:40.000000000 +0300
@@ -1,6 +1,6 @@
all: CFLAGS ?= -O2 -Wl,-s \
- -Wl,-z,relro,-z,now -fpic -pie -D_FORTIFY_SOURCE=2 -fstack-protector-all
+ -D_FORTIFY_SOURCE=2 -fstack-protector-all
all: CFLAGS += -std=c99 -pedantic -Wall -Wextra -DNDEBUG
all: hyx
@@ -13,7 +13,7 @@
hyx: *.h *.c
$(CC) \
$(CFLAGS) \
- hyx.c common.c blob.c history.c view.c input.c \
+ hyx.c common.c blob.c history.c view.c input.c memstream.c \
-o hyx
clean:
diff -Naur hyx-2020.06.09.org/view.c hyx-2020.06.09/view.c
--- hyx-2020.06.09.org/view.c 2020-06-09 15:19:50.000000000 +0300
+++ hyx-2020.06.09/view.c 2020-07-22 11:49:09.000000000 +0300
@@ -4,6 +4,7 @@
#include "view.h"
#include "input.h"
#include "ansi.h"
+#include "memstream.h"
#include <stdlib.h>
#include <stdio.h>

View file

@ -17896,6 +17896,16 @@ with pkgs;
mediastreamer-openh264 = callPackage ../development/libraries/mediastreamer/msopenh264.nix { };
memorymapping = callPackage ../development/libraries/memorymapping { };
memorymappingHook = makeSetupHook {
deps = [ memorymapping ];
} ../development/libraries/memorymapping/setup-hook.sh;
memstream = callPackage ../development/libraries/memstream { };
memstreamHook = makeSetupHook {
deps = [ memstream ];
} ../development/libraries/memstream/setup-hook.sh;
menu-cache = callPackage ../development/libraries/menu-cache { };
mergerfs = callPackage ../tools/filesystems/mergerfs { };

View file

@ -20,6 +20,7 @@ let
then callPackage ../development/coq-modules/bignums {}
else null;
category-theory = callPackage ../development/coq-modules/category-theory { };
ceres = callPackage ../development/coq-modules/ceres {};
Cheerios = callPackage ../development/coq-modules/Cheerios {};
CoLoR = callPackage ../development/coq-modules/CoLoR {};
compcert = callPackage ../development/coq-modules/compcert {
@ -75,6 +76,7 @@ let
odd-order = callPackage ../development/coq-modules/odd-order { };
paco = callPackage ../development/coq-modules/paco {};
paramcoq = callPackage ../development/coq-modules/paramcoq {};
parsec = callPackage ../development/coq-modules/parsec {};
pocklington = callPackage ../development/coq-modules/pocklington {};
QuickChick = callPackage ../development/coq-modules/QuickChick {};
reglang = callPackage ../development/coq-modules/reglang {};

View file

@ -2520,6 +2520,11 @@ in {
fastimport = callPackage ../development/python-modules/fastimport { };
fastjet = toPythonModule (pkgs.fastjet.override {
withPython = true;
inherit python;
});
fastjsonschema = callPackage ../development/python-modules/fastjsonschema { };
fastnlo_toolkit = toPythonModule (pkgs.fastnlo_toolkit.override {