Merge master into staging-next

This commit is contained in:
Frederik Rietdijk 2019-10-28 08:59:50 +01:00
commit 21635748a8
45 changed files with 559 additions and 202 deletions

View file

@ -3911,6 +3911,11 @@
githubId = 13791;
name = "Luke Gorrie";
};
lumi = {
email = "lumi@pew.im";
github = "lumi-me-not";
name = "lumi";
};
luz = {
email = "luz666@daum.net";
github = "Luz";

View file

@ -394,52 +394,22 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});
vterm = let
emacsSources = pkgs.stdenv.mkDerivation {
name = self.emacs.name + "-sources";
src = self.emacs.src;
dontConfigure = true;
dontBuild = true;
doCheck = false;
fixupPhase = ":";
installPhase = ''
mkdir -p $out
cp -a * $out
'';
};
libvterm = pkgs.libvterm-neovim.overrideAttrs(old: rec {
pname = "libvterm-neovim";
version = "2019-04-27";
name = pname + "-" + version;
src = pkgs.fetchFromGitHub {
owner = "neovim";
repo = "libvterm";
rev = "89675ffdda615ffc3f29d1c47a933f4f44183364";
sha256 = "0l9ixbj516vl41v78fi302ws655xawl7s94gmx1kb3fmfgamqisy";
};
});
in pkgs.stdenv.mkDerivation {
inherit (super.vterm) name version src;
nativeBuildInputs = [ pkgs.cmake ];
buildInputs = [ self.emacs libvterm ];
vterm = super.vterm.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [ self.emacs pkgs.cmake pkgs.libvterm-neovim ];
cmakeFlags = [
"-DEMACS_SOURCE=${emacsSources}"
"-DUSE_SYSTEM_LIBVTERM=True"
"-DEMACS_SOURCE=${self.emacs.src}"
"-DUSE_SYSTEM_LIBVTERM=ON"
];
installPhase = ''
install -d $out/share/emacs/site-lisp
install ../*.el $out/share/emacs/site-lisp
install ../*.so $out/share/emacs/site-lisp
# we need the proper out directory to exist, so we do this in the
# postInstall instead of postBuild
postInstall = ''
pushd source/build >/dev/null
make
install -m444 -t $out/share/emacs/site-lisp/elpa/vterm-** ../*.so
popd > /dev/null
rm -rf $out/share/emacs/site-lisp/elpa/vterm-**/{CMake*,build,*.c,*.h}
'';
};
});
# Legacy alias
emacs-libvterm = unstable.vterm;

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, swt, jdk, makeWrapper, alsaLib }:
{ stdenv, fetchurl, swt, jdk, makeWrapper, alsaLib, jack2, fluidsynth, libpulseaudio }:
let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux";
if stdenv.hostPlatform.system == "i686-linux" then
{ arch = "x86"; sha256 = "1qmb51k0538pn7gv4nsvhfv33xik4l4af0qmpllkzrikmj8wvzlb"; }
{ arch = "x86"; sha256 = "27675c358db237df74d20e8676000c25a87b9de0bb0a6d1c325e8d6db807d296"; }
else
{ arch = "x86_64"; sha256 = "12af47jhlrh9aq5b3d13l7cdhlndgnfpy61gz002hajbq7i00ixh"; };
{ arch = "x86_64"; sha256 = "298555a249adb3ad72f3aef72a124e30bfa01cd069c7b5d152a738140e7903a2"; };
in stdenv.mkDerivation rec {
version = "1.2";
version = "1.5.2";
pname = "tuxguitar";
src = fetchurl {
@ -18,15 +18,16 @@ in stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
cp -r lib share $out/
cp tuxguitar $out/bin/tuxguitar
cp tuxguitar.jar $out/lib
cp -r dist lib share $out/
cp tuxguitar.sh $out/bin/tuxguitar
ln -s $out/dist $out/bin/dist
ln -s $out/lib $out/bin/lib
ln -s $out/share $out/bin/share
wrapProgram $out/bin/tuxguitar \
--set JAVA "${jdk}/bin/java" \
--prefix LD_LIBRARY_PATH : "$out/lib/:${stdenv.lib.makeLibraryPath [ swt alsaLib ]}" \
--prefix LD_LIBRARY_PATH : "$out/lib/:${stdenv.lib.makeLibraryPath [ swt alsaLib jack2 fluidsynth libpulseaudio ]}" \
--prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar"
'';

View file

@ -1,5 +1,5 @@
{
"url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.11-a12e5bad/Hubstaff-1.4.11-a12e5bad.sh",
"version": "1.4.11-a12e5bad",
"sha256": "0nqmw02spplqppvz2jniq5p5y69l8n5xp9wji4032kn4qsba33jn"
"url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.0-4309ed45/Hubstaff-1.5.0-4309ed45.sh",
"version": "1.5.0-4309ed45",
"sha256": "1rfxizb28b8r344d18jh6shfcxz35vx8vh10c3j6zdcc998zkcr1"
}

View file

@ -0,0 +1,26 @@
{ lib, fetchFromGitHub, buildPythonApplication, pytest, git }:
buildPythonApplication rec {
pname = "mu-repo";
version = "1.8.0";
src = fetchFromGitHub {
owner = "fabioz";
repo = pname;
rev = with lib;
"mu_repo_" + concatStringsSep "_" (splitVersion version);
sha256 = "1dxfggzbhiips0ww2s93yba9842ycp0i3x2i8vvcx0vgicv3rv6f";
};
checkInputs = [ pytest git ];
# disable test which assumes it's a git repo
checkPhase = "py.test mu_repo --ignore=mu_repo/tests/test_checkout.py";
meta = with lib; {
description = "Tool to help in dealing with multiple git repositories";
homepage = "http://fabioz.github.io/mu-repo/";
license = licenses.gpl3;
platforms = platforms.unix;
maintainers = with maintainers; [ sikmir ];
};
}

View file

@ -22,13 +22,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "profanity";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "profanity-im";
repo = "profanity";
rev = version;
sha256 = "15adg7ndjkzy04lizjmnvv0pf0snhzp6a8x74mndcm0zma0dia0z";
sha256 = "1mcgr86wqyzqx7mqxfkk2jwx6cgnvrky3zi4v1ww0lh6j05wj9gf";
};
patches = [ ./patches/packages-osx.patch ./patches/undefined-macros.patch ];

View file

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "1.4.2",
"version": "1.5.0",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {

View file

@ -6,12 +6,12 @@
let
executableName = "riot-desktop";
version = "1.4.2";
version = "1.5.0";
riot-web-src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-web";
rev = "v${version}";
sha256 = "1s1m2jbcax92pql9yzw3kxdmn97a2xnas49rw3n1vldkla2wx4zx";
sha256 = "1xi5zg3602d7gdjxskpk2q3anpn2drrkxyirfvi9mzcfp2r05557";
};
in yarn2nix-moretea.mkYarnPackage rec {

View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "riot-web";
version = "1.4.2";
version = "1.5.0";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "0bbal3y4clgp7j703f3ll5zwhbpjz6zpw3qslwza6lik4g4k0vaj";
sha256 = "08r9473ncfy3wzqhnds729s77fq82jjgz8w3yya07aahcxzasi94";
};
installPhase = let

View file

@ -1,9 +1,9 @@
{ stdenv, lib, fetchurl, autoconf, automake, pkgconfig, libtool
, gtk2, halibut, ncurses, perl
, gtk2, halibut, ncurses, perl, darwin
}:
stdenv.mkDerivation rec {
version = "0.71";
version = "0.73";
pname = "putty";
src = fetchurl {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
"https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz"
"ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz"
];
sha256 = "1f66iss0kqk982azmxbk4xfm2i1csby91vdvly6cr04pz3i1r4rg";
sha256 = "076z34jpik2dmlwxicvf1djjgnahcqv12rjhmb9yq6ml7x0bbc1x";
};
# glib-2.62 deprecations
@ -20,9 +20,6 @@ stdenv.mkDerivation rec {
preConfigure = lib.optionalString stdenv.hostPlatform.isUnix ''
perl mkfiles.pl
( cd doc ; make );
sed -e '/AM_PATH_GTK(/d' \
-e '/AC_OUTPUT/iAM_PROG_CC_C_O' \
-e '/AC_OUTPUT/iAM_PROG_AR' -i configure.ac
./mkauto.sh
cd unix
'' + lib.optionalString stdenv.hostPlatform.isWindows ''
@ -41,7 +38,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake halibut libtool perl pkgconfig ];
buildInputs = lib.optionals stdenv.hostPlatform.isUnix [
gtk2 ncurses
];
] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp;
enableParallelBuilding = true;
meta = with lib; {

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bcompare";
version = "4.3.0.24364";
version = "4.3.1.24438";
src = fetchurl {
url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb";
sha256 = "14ff250nyqfqgm9qazg4la7ajci3bhqm376wy2j3za1vf09774kc";
sha256 = "19rbcl0l49qbzn4bisdl9ibj0qm83kjkclva4qcy7jaqna9g7qrh";
};
unpackPhase = ''
@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
ki18n
kcoreaddons
gdk-pixbuf
qt4
bzip2
];

View file

@ -213,13 +213,13 @@ rec {
};
docker_19_03 = makeOverridable dockerGen {
version = "19.03.2";
rev = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e";
sha256 = "0bghqwxlx4v06bwcv3c2wizbihhf983gvypx5sjcbgmiyd3bgb47";
version = "19.03.4";
rev = "9013bf583a215dc1488d941f9b6f7f11e1ea899f";
sha256 = "094d6d93jd7g1vw362cqbv9qbyv8h6pb6dj750pgqvnf1bn1mffb";
runcRev = "3e425f80a8c931f88e6d94a8c831b9d5aa481657";
runcSha256 = "18psc830b2rkwml1x6vxngam5b5wi3pj14mw817rshpzy87prspj";
containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb";
containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357";
containerdRev = "b34a5c8af56e510852c35414db4c1f4fa6172339";
containerdSha256 = "1kddhkd93wkrimk0yjcqiavdrqc818nd39rf3wrgxyilx1mfnrwb";
tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662";
tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
};

View file

@ -0,0 +1,23 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "firectl";
version = "0.1.0";
src = fetchFromGitHub {
owner = "firecracker-microvm";
repo = pname;
rev = "v${version}";
sha256 = "1ni3yx4rjhrkqk2038c6hkb2jwsdj2llx233wd5wgpvb6c57652p";
};
modSha256 = "1nqjz1afklcxc3xcpmygjdh3lfxjk6zvmghr8z8fr3nw2wvw2ddr";
meta = with stdenv.lib; {
description = "A command-line tool to run Firecracker microVMs";
homepage = https://github.com/firecracker-microvm/firectl;
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ xrelkd ];
};
}

View file

@ -1,7 +1,27 @@
{ stdenv, fetchurl, pkgconfig, meson, gettext, gobject-introspection, glib
, clutter-gtk, clutter-gst, gnome3, gtksourceview4, gjs
, webkitgtk, libmusicbrainz5, icu, wrapGAppsHook, gst_all_1
, gdk-pixbuf, librsvg, gtk3, harfbuzz, ninja, epoxy }:
{ stdenv
, fetchurl
, pkgconfig
, meson
, gettext
, gobject-introspection
, glib
, clutter-gtk
, clutter-gst
, gnome3
, gtksourceview4
, gjs
, webkitgtk
, libmusicbrainz5
, icu
, wrapGAppsHook
, gst_all_1
, gdk-pixbuf
, librsvg
, gtk3
, harfbuzz
, ninja
, epoxy
}:
stdenv.mkDerivation rec {
pname = "sushi";
@ -13,15 +33,42 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
pkgconfig meson ninja gettext gobject-introspection wrapGAppsHook
pkgconfig
meson
ninja
gettext
gobject-introspection
wrapGAppsHook
];
buildInputs = [
glib gtk3 gnome3.evince icu harfbuzz
clutter-gtk clutter-gst gjs gtksourceview4 gdk-pixbuf
librsvg libmusicbrainz5 webkitgtk epoxy
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
glib
gtk3
gnome3.evince
icu
harfbuzz
clutter-gtk
clutter-gst
gjs
gtksourceview4
gdk-pixbuf
librsvg
libmusicbrainz5
webkitgtk
epoxy
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
];
# See https://github.com/NixOS/nixpkgs/issues/31168
postInstall = ''
for file in $out/libexec/org.gnome.NautilusPreviewer
do
sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \
-i $file
done
'';
passthru = {
updateScript = gnome3.updateScript {
packageName = "sushi";

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nvidia-texture-tools";
version = "2.1.0";
version = "unstable-2019-10-27";
src = fetchFromGitHub {
owner = "castano";
repo = "nvidia-texture-tools";
rev = version;
sha256 = "0p8ja0k323nkgm07z0qlslg6743vimy9rf3wad2968az0vwzjjyx";
rev = "a131e4c6b0b7c9c73ccc3c9e6f1c7e165be86bcc";
sha256 = "1qzyr3ib5dpxyq1y33lq02qv4cww075sm9bm4f651d34q5x38sk3";
};
nativeBuildInputs = [ cmake ];
@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/castano/nvidia-texture-tools;
license = licenses.mit;
platforms = platforms.unix;
broken = stdenv.isAarch64;
};
}

View file

@ -3,11 +3,25 @@
For details on using mkl as a blas provider for python packages such as numpy,
numexpr, scipy, etc., see the Python section of the NixPkgs manual.
*/
stdenvNoCC.mkDerivation rec {
name = "mkl-${version}";
version = "${date}.${rel}";
date = "2019.3";
rel = "199";
let
# Release notes and download URLs are here:
# https://registrationcenter.intel.com/en/products/
version = "${year}.${spot}.${rel}";
year = "2019";
# Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details:
# https://github.com/matthewbauer/undmg/issues/4
spot = if stdenvNoCC.isDarwin then "3" else "5";
rel = if stdenvNoCC.isDarwin then "199" else "281";
rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}";
# Intel openmp uses its own versioning, but shares the spot release patch.
openmp-ver = "19.0.${spot}-${rel}-19.0.${spot}-${rel}";
in stdenvNoCC.mkDerivation {
pname = "mkl";
inherit version;
src = if stdenvNoCC.isDarwin
then
@ -17,27 +31,25 @@ stdenvNoCC.mkDerivation rec {
})
else
(fetchurl {
url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15275/l_mkl_${version}.tgz";
sha256 = "13rb2v2872jmvzcqm4fqsvhry0j2r5cn4lqql4wpqbl1yia2pph6";
url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15816/l_mkl_${version}.tgz";
sha256 = "0zkk4rrq7g44acxaxhpd2053r66w169mww6917an0lxhd52fm5cr";
});
nativeBuildInputs = if stdenvNoCC.isDarwin
then
[ undmg
darwin.cctools
]
[ undmg darwin.cctools ]
else
[ rpmextract ];
buildPhase = if stdenvNoCC.isDarwin then ''
for f in Contents/Resources/pkg/*.tgz; do
tar xzvf $f
done
for f in Contents/Resources/pkg/*.tgz; do
tar xzvf $f
done
'' else ''
rpmextract rpm/intel-mkl-common-c-${date}-${rel}-${date}-${rel}.noarch.rpm
rpmextract rpm/intel-mkl-core-${date}-${rel}-${date}-${rel}.x86_64.rpm
rpmextract rpm/intel-mkl-core-rt-${date}-${rel}-${date}-${rel}.x86_64.rpm
rpmextract rpm/intel-openmp-19.0.3-${rel}-19.0.3-${rel}.x86_64.rpm
rpmextract rpm/intel-mkl-common-c-${rpm-ver}.noarch.rpm
rpmextract rpm/intel-mkl-core-${rpm-ver}.x86_64.rpm
rpmextract rpm/intel-mkl-core-rt-${rpm-ver}.x86_64.rpm
rpmextract rpm/intel-openmp-${openmp-ver}.x86_64.rpm
'';
installPhase = ''
@ -82,12 +94,12 @@ stdenvNoCC.mkDerivation rec {
# larger updated load commands do not fit. Use install_name_tool
# explicitly and ignore the error.
postFixup = stdenvNoCC.lib.optionalString stdenvNoCC.isDarwin ''
for f in $out/lib/*.dylib; do
install_name_tool -id $out/lib/$(basename $f) $f || true
done
install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libmkl_intel_thread.dylib
install_name_tool -change @rpath/libtbb.dylib $out/lib/libtbb.dylib $out/lib/libmkl_tbb_thread.dylib
install_name_tool -change @rpath/libtbbmalloc.dylib $out/lib/libtbbmalloc.dylib $out/lib/libtbbmalloc_proxy.dylib
for f in $out/lib/*.dylib; do
install_name_tool -id $out/lib/$(basename $f) $f || true
done
install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libmkl_intel_thread.dylib
install_name_tool -change @rpath/libtbb.dylib $out/lib/libtbb.dylib $out/lib/libmkl_tbb_thread.dylib
install_name_tool -change @rpath/libtbbmalloc.dylib $out/lib/libtbbmalloc.dylib $out/lib/libtbbmalloc_proxy.dylib
'';
# Per license agreement, do not modify the binary
@ -105,6 +117,6 @@ stdenvNoCC.mkDerivation rec {
homepage = https://software.intel.com/en-us/mkl;
license = licenses.issl;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = [ maintainers.bhipple ];
maintainers = with maintainers; [ bhipple ];
};
}

View file

@ -37,5 +37,5 @@ let
};
};
in {
xapian_1_4 = generic "1.4.12" "0z5c1y9vp519h2x2igjq39v6j615nppry0wasd0xn4hphgd3d2jg";
xapian_1_4 = generic "1.4.13" "0z0k8902bz2ckdggikj5yz11ik2n8krmdwzvpqv60phcm3zzzy4k";
}

View file

@ -1,14 +1,14 @@
diff -Naur xapian-core.old/tests/api_db.cc xapian-core.new/tests/api_db.cc
--- xapian-core.old/tests/api_db.cc
+++ xapian-core.new/tests/api_db.cc
@@ -998,6 +998,7 @@
@@ -1020,6 +1020,7 @@
// test for keepalives
DEFINE_TESTCASE(keepalive1, remote) {
+ SKIP_TEST("Fails in darwin nix build environment");
Xapian::Database db(get_remote_database("apitest_simpledata", 5000));
XFAIL_FOR_BACKEND("multi_glass_remoteprog_glass",
"Multi remote databases are currently buggy");
/* Test that keep-alives work */
diff -Naur xapian-core.old/tests/api_scalability.cc xapian-core.new/tests/api_scalability.cc
--- xapian-core.old/tests/api_scalability.cc
+++ xapian-core.new/tests/api_scalability.cc

View file

@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
inherit (dune) installPhase;
passthru = { inherit hasC; };
meta = {
homepage = "https://github.com/mirage/checkseum";
description = "ADLER-32 and CRC32C Cyclic Redundancy Check";

View file

@ -1,30 +1,27 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg
{ lib, fetchurl, buildDunePackage
, checkseum, cmdliner
, alcotest, bos, camlzip, mmap, re
}:
if !stdenv.lib.versionAtLeast ocaml.version "4.03"
then throw "decompress is not available for OCaml ${ocaml.version}"
else
buildDunePackage rec {
version = "0.9.0";
pname = "decompress";
stdenv.mkDerivation rec {
version = "0.6";
name = "ocaml${ocaml.version}-decompress-${version}";
src = fetchFromGitHub {
owner = "mirage";
repo = "decompress";
rev = "v${version}";
sha256 = "0hfs5zrvimzvjwdg57vrxx9bb7irvlm07dk2yv3s5qhj30zimd08";
src = fetchurl {
url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh";
};
buildInputs = [ ocaml findlib ocamlbuild topkg ];
inherit (topkg) buildPhase installPhase;
buildInputs = [ cmdliner ];
propagatedBuildInputs = [ checkseum ];
checkInputs = lib.optionals doCheck [ alcotest bos camlzip mmap re ];
doCheck = true;
meta = {
description = "Pure OCaml implementation of Zlib";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/mirage/decompress";
broken = !checkseum.hasC;
};
}

View file

@ -0,0 +1,20 @@
{ lib, buildDunePackage, fetchurl, ocaml, alcotest, angstrom, ke }:
buildDunePackage rec {
pname = "encore";
version = "0.3";
src = fetchurl {
url = "https://github.com/mirage/encore/releases/download/v${version}/encore-v${version}.tbz";
sha256 = "05nv6yms5axsmq9cspr7884rz5kirj50izx3vdm89q4yl186qykl";
};
propagatedBuildInputs = [ angstrom ke ];
checkInputs = lib.optional doCheck alcotest;
doCheck = lib.versions.majorMinor ocaml.version != "4.07";
meta = {
homepage = "https://github.com/mirage/encore";
description = "Library to generate encoder/decoder which ensure isomorphism";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
};
}

View file

@ -1,27 +1,28 @@
{ stdenv, fetchFromGitHub, buildDunePackage
, astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, ocplib-endian, uri
, alcotest, mtime, nocrypto
{ lib, fetchFromGitHub, buildDunePackage
, alcotest, git, mtime, nocrypto
, angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt
, fpath, hex, ke, logs, lru, ocaml_lwt, ocamlgraph, ocplib-endian, uri, rresult
}:
buildDunePackage rec {
pname = "git";
version = "1.11.5";
version = "2.1.0";
src = fetchFromGitHub {
owner = "mirage";
repo = "ocaml-git";
rev = version;
sha256 = "0r1bxpxjjnl9hh8xbabsxl7svzvd19hfy73a2y1m4kljmw64dpfh";
sha256 = "0v55zkwgml6i5hp0kzynbi58z6j15k3qgzg06b3h8pdbv5fwd1jp";
};
buildInputs = [ alcotest mtime nocrypto ];
propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph ocplib-endian uri ];
propagatedBuildInputs = [ angstrom astring cstruct decompress digestif encore duff fmt fpath hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult ];
checkInputs = lib.optionals doCheck [ alcotest git mtime nocrypto ];
doCheck = true;
meta = {
description = "Git format and protocol in pure OCaml";
license = stdenv.lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
};
}

View file

@ -1,26 +1,27 @@
{ stdenv, fetchFromGitHub, which, ocaml, findlib, ocamlbuild, decompress }:
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, decompress }:
stdenv.mkDerivation rec {
version = "20171028";
name = "ocaml${ocaml.version}-imagelib-${version}";
buildDunePackage rec {
minimumOCamlVersion = "4.07";
version = "20191011";
pname = "imagelib";
src = fetchFromGitHub {
owner = "rlepigre";
repo = "ocaml-imagelib";
rev = "ocaml-imagelib_${version}";
sha256 = "1frkrgcrv4ybdmqcfxpfsywx0hm1arxgxp32n8kzky6qip1g0zxf";
rev = "03fed7733825cef7e0465163f398f6af810e2e75";
sha256 = "0h7vgyss42nhlfqpbdnb54nxq86rskqi2ilx8b87r0hi19hqx463";
};
buildInputs = [ which ocaml findlib ocamlbuild ];
patches = [ (fetchpatch {
url = "https://github.com/rlepigre/ocaml-imagelib/pull/24/commits/4704fd44adcda62e0d96ea5b1927071326aa6111.patch";
sha256 = "0ipjab1hfa2v2pnd8g1k3q2ia0plgiw7crm3fa4w2aqpzdyabkb9";
}) ];
propagatedBuildInputs = [ decompress ];
createFindlibDestdir = true;
meta = {
description = "Image formats such as PNG and PPM in OCaml";
license = stdenv.lib.licenses.lgpl3;
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = lib.licenses.lgpl3;
maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
};
}

View file

@ -0,0 +1,8 @@
{ buildDunePackage, imagelib }:
buildDunePackage {
pname = "imagelib-unix";
inherit (imagelib) version src meta;
propagatedBuildInputs = [ imagelib ];
}

View file

@ -0,0 +1,28 @@
{ lib, buildDunePackage, fetchurl
, bigarray-compat, fmt
, alcotest, bigstringaf
}:
buildDunePackage rec {
pname = "ke";
version = "0.4";
src = fetchurl {
url = "https://github.com/mirage/ke/releases/download/v${version}/ke-v${version}.tbz";
sha256 = "13c9xy60vmq29mnwpg3h3zgl6gjbjfwbx1s0crfc6xwvark0zxnx";
};
propagatedBuildInputs = [ bigarray-compat fmt ];
checkInputs = lib.optionals doCheck [ alcotest bigstringaf ];
doCheck = true;
minimumOCamlVersion = "4.03";
meta = {
description = "Fast implementation of queue in OCaml";
homepage = "https://github.com/mirage/ke";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
};
}

View file

@ -0,0 +1,33 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
, tatsu, arrow
, pytest-sugar, pytestpep8, pytest-flakes, pytestcov
}:
buildPythonPackage rec {
pname = "ics";
version = "0.6";
src = fetchFromGitHub {
owner = "C4ptainCrunch";
repo = "ics.py";
rev = "v${version}";
sha256 = "02bs9wlh40p1n33jchrl2cdpsnm5hq84070by3b6gm0vmgz6gn5v";
};
propagatedBuildInputs = [ tatsu arrow ];
checkInputs = [ pytest-sugar pytestpep8 pytest-flakes pytestcov ];
disabled = pythonOlder "3.6";
meta = with stdenv.lib; {
description = "Pythonic and easy iCalendar library (RFC 5545)";
longDescription = ''
Ics.py is a pythonic and easy iCalendar library. Its goals are to read and
write ics data in a developer friendly way.
'';
homepage = "http://icspy.readthedocs.org/en/stable/";
license = licenses.asl20;
maintainers = with maintainers; [ primeos ];
};
}

View file

@ -7,7 +7,7 @@ buildPythonPackage rec {
version = "2.1";
src = fetchPypi {
inherit pname version;
sha256 = "0e4c278310a5e1ecd565f09555b89ed923cac100b2525797201d2a89dcab337c";
sha256 = "0z1kmgf8jahx42bmflmj030wl8yrksw5b5ghcpayrqd5221jfk0f";
};
doCheck = false;

View file

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "pelican";
version = "4.1.1";
version = "4.2.0";
src = fetchFromGitHub {
owner = "getpelican";
repo = "pelican";
rev = version;
sha256 = "08lwbkgqdf6qx9vg17qj70k7nz2j34ymlnrc4cbz7xj98cw4ams1";
sha256 = "0w9nqdw2jmqc6kqwg4rh6irr5k6j7hk8axg6vgd137rs50v62yv5";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''
@ -31,7 +31,7 @@ buildPythonPackage rec {
glibcLocales
# Note: Pelican has to adapt to a changed CLI of pandoc before enabling this
# again. Compare https://github.com/getpelican/pelican/pull/2252.
# Version 4.1.1 is incompatible with our current pandoc version.
# Version 4.2.0 is incompatible with our current pandoc version.
# pandoc
git
mock

View file

@ -22,17 +22,17 @@ stdenv.mkDerivation rec {
dontCheck = true;
installPhase = ''
install -D py3buddy.py $out/lib/${python.libPrefix}/site-packages/py3buddy.py
install -D py3buddy.py $out/${python.sitePackages}/py3buddy.py
'';
postInstall = ''
install -D 99-ibuddy.rules $out/lib/udev/rules.d/99-ibuddy.rules
'';
meta = {
meta = with stdenv.lib; {
description = "Code to work with the iBuddy MSN figurine";
homepage = "https://github.com/armijnhemel/py3buddy";
license = with stdenv.lib.licenses; [ mit ];
maintainers = with stdenv.lib.maintainers; [ prusnak ];
license = with licenses; [ mit ];
maintainers = with maintainers; [ prusnak ];
};
}

View file

@ -0,0 +1,21 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "python-logstash";
version = "0.4.6";
src = fetchPypi {
inherit pname version;
sha256 = "13763yx0k655y0c8gxv7jj6cqp45zypx2fmnc56jnn9zz1fkx50h";
};
# no tests
doCheck = false;
meta = with lib; {
description = "Python logging handler for Logstash";
homepage = https://github.com/vklochan/python-logstash;
maintainers = with maintainers; [ peterromfeldhk ];
license = licenses.mit;
};
}

View file

@ -0,0 +1,23 @@
{ stdenv, buildPythonPackage, fetchPypi, requests }:
buildPythonPackage rec {
pname = "python-nomad";
version = "1.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "1rf6ad35vg3yi1p4l383xwx0ammdvr1k71bxg93bgcvljypx4cyn";
};
propagatedBuildInputs = [ requests ];
# Tests require nomad agent
doCheck = false;
meta = with stdenv.lib; {
description = "Python client library for Hashicorp Nomad";
homepage = "https://github.com/jrxFive/python-nomad";
license = licenses.mit;
maintainers = with maintainers; [ xbreak ];
};
}

View file

@ -1,6 +1,6 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, nose
, plumbum
}:
@ -9,12 +9,21 @@ buildPythonPackage rec {
pname = "rpyc";
version = "4.1.2";
src = fetchPypi {
inherit pname version;
sha256 = "0df276076891797bbaaff322cc6debb02e10817426bba00a9beca915053a8a91";
src = fetchFromGitHub {
owner = "tomerfiliba";
repo = pname;
rev = version;
sha256 = "1xvrcik1650r1412fg79va0kd0fgg1ml241y1ai429qwy87dil1k";
};
propagatedBuildInputs = [ nose plumbum ];
propagatedBuildInputs = [ plumbum ];
checkInputs = [ nose ];
checkPhase = ''
cd tests
# some tests have added complexities and some tests attempt network use
nosetests -I test_deploy -I test_gevent_server -I test_ssh -I test_registry
'';
meta = with stdenv.lib; {
description = "Remote Python Call (RPyC), a transparent and symmetric RPC library";

View file

@ -0,0 +1,40 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
, colorama, mypy, pyyaml, regex
, dataclasses, typing
, pytestrunner, pytest-mypy
}:
buildPythonPackage rec {
pname = "TatSu";
version = "4.4.0";
src = fetchFromGitHub {
owner = "neogeny";
repo = pname;
rev = "v${version}";
sha256 = "1jjd73yr3x56ij2ggxf6s62mf90i9v7wn3i0h67zxys55hlp2yh4";
};
nativeBuildInputs = [ pytestrunner ];
propagatedBuildInputs = [ colorama mypy pyyaml regex ]
++ stdenv.lib.optionals (pythonOlder "3.7") [ dataclasses ]
++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
checkInputs = [ pytest-mypy ];
checkPhase = ''
pytest test/
'';
meta = with stdenv.lib; {
description = "Generates Python parsers from grammars in a variation of EBNF";
longDescription = ''
TatSu (the successor to Grako) is a tool that takes grammars in a
variation of EBNF as input, and outputs memoizing (Packrat) PEG parsers in
Python.
'';
homepage = "https://tatsu.readthedocs.io/";
license = licenses.bsd2;
maintainers = with maintainers; [ primeos ];
};
}

View file

@ -4,13 +4,19 @@ stdenv.mkDerivation rec {
pname = "sndio";
version = "1.6.0";
enableParallelBuilding = true;
buildInputs = [ alsaLib ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ alsaLib ];
src = fetchurl {
url = "http://www.sndio.org/sndio-${version}.tar.gz";
sha256 = "1havdx3q4mipgddmd2bnygr1yh6y64567m1yqwjapkhsq550dq4r";
};
postFixup = stdenv.lib.optionalString stdenv.isDarwin ''
for file in $out/bin/*; do
install_name_tool -change libsndio.7.0.dylib $out/lib/libsndio.dylib $file
done
'';
meta = with stdenv.lib; {
homepage = "http://www.sndio.org";
description = "Small audio and MIDI framework part of the OpenBSD project";

View file

@ -6,12 +6,12 @@
stdenv.mkDerivation rec {
pname = "rabbitmq-server";
version = "3.7.18";
version = "3.8.0";
# when updating, consider bumping elixir version in all-packages.nix
src = fetchurl {
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "1vzx9g2k7ynbv2gz450cwjyxcn3vcxsmlpnvq1r5wzcf25giy9ky";
sha256 = "174ai8ihk50gwbqinxxxx5is6izvgmfca7skvvp4yk6fl8nbwm15";
};
buildInputs =

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "clickhouse";
version = "19.13.5.44";
version = "19.13.6.51";
src = fetchFromGitHub {
owner = "yandex";
repo = "ClickHouse";
rev = "v${version}-stable";
sha256 = "1h0jjpa1wrms5vcgx1vf8fmkc7jjrql1r70dvwr0nw8f7rfyi1l6";
sha256 = "0mcwfam1nrs2g54syw7vvpfkjn3l4gfzvla7xbg92lr03fn6kbn2";
};
nativeBuildInputs = [ cmake libtool ninja ];

View file

@ -4,13 +4,13 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
version = "2019-10-25";
version = "2019-10-27";
pname = "oh-my-zsh";
rev = "9785d24172a8cc558e90dd266e37ef5ffa29aa80";
rev = "e363109a6d3367d8be1dd66f05a38eb38b4257d7";
src = fetchgit { inherit rev;
url = "https://github.com/robbyrussell/oh-my-zsh";
sha256 = "0rjrswk4j3ga49s15z7fss64k0n3bz6z0j0sx7hai6ry58bh3m2v";
sha256 = "05ald17kr9bqx106a4cc5i48w8sf67vlghd96k2lciiwjy9dcdki";
};
pathsToLink = [ "/share/oh-my-zsh" ];

View file

@ -0,0 +1,28 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, libXrandr, libX11 }:
rustPlatform.buildRustPackage rec {
pname = "shotgun";
version = "2.2.0";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libXrandr libX11 ];
src = fetchFromGitHub {
owner = "neXromancers";
repo = pname;
rev = "v${version}";
sha256 = "tJnF1X+NI1hP0J/n3rGy8TD/yIveqRPVlJvJvn0C7Do=";
};
cargoSha256 = "TL2WehcCwygLMVVrBHOX1HgVtDhgVsIgUeiadEjCj1o=";
meta = with lib; {
description = "Minimal X screenshot utility";
homepage = "https://github.com/neXromancers/shotgun";
license = with licenses; [ mpl20 ];
maintainers = with maintainers; [ lumi ];
platforms = platforms.linux;
badPlatforms = [ "aarch64-linux" ];
};
}

View file

@ -1,19 +1,58 @@
{ stdenv, fetchurl, colord, intltool, glib, gtk3, pkgconfig, lcms2 }:
{ stdenv
, fetchurl
, colord
, gettext
, meson
, ninja
, gobject-introspection
, gtk-doc
, docbook-xsl-ns
, docbook_xsl
, docbook_xml_dtd_412
, libxslt
, glib
, gtk3
, pkgconfig
, lcms2
}:
stdenv.mkDerivation rec {
name = "colord-gtk-0.1.26";
pname = "colord-gtk";
version = "0.2.0";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "https://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
sha256 = "0i9y3bb5apj6a0f8cx36l6mjzs7xc0k7nf0magmf58vy2mzhpl18";
url = "https://www.freedesktop.org/software/colord/releases/${pname}-${version}.tar.xz";
sha256 = "05y78jbcbar22sgyhzffhv98dbpl4v6k8j9p807h17y6ighglk1a";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool colord glib gtk3 lcms2 ];
nativeBuildInputs = [
pkgconfig
gettext
meson
ninja
gobject-introspection
gtk-doc
docbook-xsl-ns
docbook_xsl
docbook_xml_dtd_412
libxslt
];
meta = {
homepage = http://www.freedesktop.org/software/colord/intro.html;
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.linux;
buildInputs = [
glib
lcms2
];
propagatedBuildInputs = [
colord
gtk3
];
meta = with stdenv.lib; {
homepage = "https://www.freedesktop.org/software/colord/intro.html";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
};
}

View file

@ -16,16 +16,16 @@ with rustPlatform;
buildRustPackage rec {
pname = "ffsend";
version = "0.2.52";
version = "0.2.54";
src = fetchFromGitLab {
owner = "timvisee";
repo = "ffsend";
rev = "v${version}";
sha256 = "0bz0pgv7vdcha6sx2csx3mhkj4ph90w32p7h1wjvcgg3wlk1cgsf";
sha256 = "11g4gv6p37xpay8v0q6kv5fblsxixcm8l0wkdvzmbv7933318qz8";
};
cargoSha256 = "01sgk4101ad0zk1k8zz89fsk2iq6j2vr8xd0wi6h88g2lgxvffzf";
cargoSha256 = "0wri2shj5xxgjv8gl0fq776s20897zwsgglh8ghgd2z3zjwjachw";
nativeBuildInputs = [ cmake pkgconfig installShellFiles ];
buildInputs = [ openssl ]

View file

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, qtbase, qttools, qmake }:
{ mkDerivation, lib, fetchurl, qtbase, qtsvg, qttools, qmake }:
let inherit (lib) getDev; in
@ -13,16 +13,13 @@ mkDerivation rec {
nativeBuildInputs = [ qmake qttools ];
buildInputs = [ qtbase ];
buildInputs = [ qtbase qtsvg ];
qmakeFlags = [
"LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease"
"PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}"
];
preConfigure = ''
qmakeFlags+=" PLUGINDIR=$out/$qtPluginPrefix"
'';
enableParallelBuilding = true;
meta = with lib; {

View file

@ -9,6 +9,8 @@
, wrapGAppsHook
, libxml2
, libgda
, libsoup
, json-glib
, gspell
, glib
, gtk3
@ -19,11 +21,11 @@
stdenv.mkDerivation rec {
pname = "gtranslator";
version = "3.32.1";
version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1nmlj41wm02lbgrxdlpqpcgdab5cxsvggvqnk43v6kk86q27pcz1";
sha256 = "05zvpx330h9k7b12p07bhcy47vq66260fmiph2b6h97xpl15rwmj";
};
nativeBuildInputs = [
@ -42,6 +44,8 @@ stdenv.mkDerivation rec {
gtk3
gtksourceview4
libgda
libsoup
json-glib
gettext
gspell
gsettings-desktop-schemas

View file

@ -1655,6 +1655,8 @@ in
firecracker = callPackage ../applications/virtualization/firecracker { };
firectl = callPackage ../applications/virtualization/firectl { };
firestarter = callPackage ../applications/misc/firestarter { };
fsmon = callPackage ../tools/misc/fsmon { };
@ -3826,7 +3828,6 @@ in
};
hdf5 = callPackage ../tools/misc/hdf5 {
stdenv = gcc7Stdenv;
gfortran = null;
szip = null;
mpi = null;
@ -19820,6 +19821,8 @@ in
mtpaint = callPackage ../applications/graphics/mtpaint { };
mu-repo = python3Packages.callPackage ../applications/misc/mu-repo { };
mucommander = callPackage ../applications/misc/mucommander { };
multimarkdown = callPackage ../tools/typesetting/multimarkdown { };
@ -20711,6 +20714,8 @@ in
shfmt = callPackage ../tools/text/shfmt { };
shotgun = callPackage ../tools/graphics/shotgun {};
shutter = callPackage ../applications/graphics/shutter { };
simple-scan = gnome3.simple-scan;

View file

@ -233,6 +233,8 @@ let
elpi = callPackage ../development/ocaml-modules/elpi { };
encore = callPackage ../development/ocaml-modules/encore { };
enumerate = callPackage ../development/ocaml-modules/enumerate { };
eqaf = callPackage ../development/ocaml-modules/eqaf { };
@ -287,6 +289,8 @@ let
imagelib = callPackage ../development/ocaml-modules/imagelib { };
imagelib-unix = callPackage ../development/ocaml-modules/imagelib/unix.nix { };
inotify = callPackage ../development/ocaml-modules/inotify { };
integers = callPackage ../development/ocaml-modules/integers { };
@ -314,7 +318,7 @@ let
gg = callPackage ../development/ocaml-modules/gg { };
git = callPackage ../development/ocaml-modules/git { };
git = callPackage ../development/ocaml-modules/git { inherit (pkgs) git; };
git-http = callPackage ../development/ocaml-modules/git-http { };
@ -362,6 +366,8 @@ let
jsonm = callPackage ../development/ocaml-modules/jsonm { };
ke = callPackage ../development/ocaml-modules/ke { };
lablgl = callPackage ../development/ocaml-modules/lablgl { };
lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { };

View file

@ -906,7 +906,7 @@ in {
pybind11 = callPackage ../development/python-modules/pybind11 { };
py3buddy = callPackage ../development/python-modules/py3buddy { };
py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { });
pybullet = callPackage ../development/python-modules/pybullet { };
@ -3494,6 +3494,8 @@ in {
icalendar = callPackage ../development/python-modules/icalendar { };
ics = callPackage ../development/python-modules/ics { };
ifaddr = callPackage ../development/python-modules/ifaddr { };
imageio = callPackage ../development/python-modules/imageio { };
@ -5065,6 +5067,8 @@ in {
tasklib = callPackage ../development/python-modules/tasklib { };
tatsu = callPackage ../development/python-modules/tatsu { };
tbm-utils = callPackage ../development/python-modules/tbm-utils { };
tempita = callPackage ../development/python-modules/tempita { };
@ -5630,6 +5634,8 @@ in {
python-libarchive = callPackage ../development/python-modules/python-libarchive { };
python-logstash = callPackage ../development/python-modules/python-logstash { };
libarchive-c = callPackage ../development/python-modules/libarchive-c {
inherit (pkgs) libarchive;
};
@ -5854,6 +5860,8 @@ in {
pyregion = callPackage ../development/python-modules/pyregion {};
python-nomad = callPackage ../development/python-modules/python-nomad { };
python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { };
python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { };