Merge staging-next into staging
This commit is contained in:
Frederik Rietdijk
@@ -23,7 +23,6 @@ agda.mkDerivation (self: rec {
|
||||
description = "A standard library for use with the Agda compiler";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
broken = stdenv.isDarwin;
|
||||
maintainers = with maintainers; [ jwiegley mudri ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,23 +1,36 @@
|
||||
{ stdenv, fetchFromGitHub, cmake }:
|
||||
{ stdenv, fetchFromGitHub, cmake, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "actor-framework";
|
||||
version = "0.17.1";
|
||||
version = "0.17.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actor-framework";
|
||||
repo = "actor-framework";
|
||||
rev = version;
|
||||
sha256 = "1xbq591m3v6pkz4z3dg2lsxr6bxv1lpz4yhdci3vi55y6x9pwyfw";
|
||||
sha256 = "187r7vc4kpd0v6bb1y51zwqm9y1lh0m84vkwmrxn8rrp4bwdxlpj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCAF_NO_EXAMPLES:BOOL=TRUE"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "test";
|
||||
preCheck = ''
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
|
||||
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$PWD/lib
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "An open source implementation of the actor model in C++";
|
||||
homepage = http://actor-framework.org/;
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ bobakker ];
|
||||
maintainers = with maintainers; [ bobakker tobim ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,17 +1,20 @@
|
||||
{ fetchurl, stdenv, glib, pkgconfig, gettext }:
|
||||
{ fetchurl, stdenv, pkgconfig, autoreconfHook, gettext, glib }:
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gts";
|
||||
version = "0.7.6";
|
||||
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gts/${pname}-${version}.tar.gz";
|
||||
sha256 = "07mqx09jxh8cv9753y2d2jsv7wp8vjmrd7zcfpbrddz3wc9kx705";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ glib gettext ];
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
buildInputs = [ gettext ];
|
||||
propagatedBuildInputs = [ glib ];
|
||||
|
||||
doCheck = false; # fails with "permission denied"
|
||||
|
||||
|
||||
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://github.com/andrewrk/libgroove;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ andrewrk ma27 ];
|
||||
maintainers = with maintainers; [ andrewrk ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
# the ngspice derivation.
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libngspice";
|
||||
version = "30";
|
||||
version = "31";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz";
|
||||
sha256 = "15v0jdfy2a2zxp8dmy04fdp7w7a4vwvffcwa688r81b86wphxzh8";
|
||||
sha256 = "10n2lnfrpsv4vyrirkphr4jwjjhy7i617g6za78dwirfjq63npw4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flex bison ];
|
||||
|
||||
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a";
|
||||
};
|
||||
|
||||
patches = [ ./honor-XKB_CONFIG_ROOT.patch ];
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
# TODO: enable xmodmap support, needs xmodmap DB
|
||||
|
||||
@@ -0,0 +1,89 @@
|
||||
From 999a419f4b36764a7269650a7f965d48bd4b73f7 Mon Sep 17 00:00:00 2001
|
||||
From: Louis Bettens <louis@bettens.info>
|
||||
Date: Sat, 28 Dec 2019 14:30:58 +0100
|
||||
Subject: [PATCH] honor $XKB_CONFIG_ROOT
|
||||
|
||||
---
|
||||
libxklavier/xklavier_config_xkb.c | 30 +++++++++++++++++++++++++-----
|
||||
1 file changed, 25 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/libxklavier/xklavier_config_xkb.c b/libxklavier/xklavier_config_xkb.c
|
||||
index baec569..00e8de5 100644
|
||||
--- a/libxklavier/xklavier_config_xkb.c
|
||||
+++ b/libxklavier/xklavier_config_xkb.c
|
||||
@@ -45,6 +45,18 @@
|
||||
#define XK_XKB_KEYS
|
||||
#include <X11/keysymdef.h>
|
||||
|
||||
+static const gchar *
|
||||
+xkl_xkb_get_base_path(void)
|
||||
+{
|
||||
+ const gchar *base_path;
|
||||
+
|
||||
+ base_path = g_getenv ("XKB_CONFIG_ROOT");
|
||||
+ if (!base_path)
|
||||
+ base_path = XKB_BASE;
|
||||
+
|
||||
+ return base_path;
|
||||
+}
|
||||
+
|
||||
#ifdef LIBXKBFILE_PRESENT
|
||||
static XkbRF_RulesPtr xkl_rules;
|
||||
|
||||
@@ -65,7 +77,8 @@ xkl_rules_set_load(XklEngine * engine)
|
||||
|
||||
locale = setlocale(LC_ALL, NULL);
|
||||
|
||||
- g_snprintf(file_name, sizeof file_name, XKB_BASE "/rules/%s", rf);
|
||||
+ g_snprintf(file_name, sizeof file_name, "%s/rules/%s",
|
||||
+ xkl_xkb_get_base_path(), rf);
|
||||
xkl_debug(160, "Loading rules from [%s]\n", file_name);
|
||||
|
||||
rules_set = XkbRF_Load(file_name, locale, True, True);
|
||||
@@ -98,10 +111,14 @@ gboolean
|
||||
xkl_xkb_load_config_registry(XklConfigRegistry * config,
|
||||
gboolean if_extras_needed)
|
||||
{
|
||||
- return xkl_config_registry_load_helper(config,
|
||||
+ const gchar *rules_path = g_strdup_printf("%s/rules",
|
||||
+ xkl_xkb_get_base_path());
|
||||
+ gboolean ok = xkl_config_registry_load_helper(config,
|
||||
XKB_DEFAULT_RULESET,
|
||||
- XKB_BASE "/rules",
|
||||
+ rules_path,
|
||||
if_extras_needed);
|
||||
+ g_free(rules_path);
|
||||
+ return ok;
|
||||
}
|
||||
|
||||
#ifdef LIBXKBFILE_PRESENT
|
||||
@@ -249,6 +266,7 @@ xkl_config_get_keyboard(XklEngine * engine,
|
||||
pid_t cpid, pid;
|
||||
int status = 0;
|
||||
FILE *tmpxkb;
|
||||
+ const gchar *opt_I;
|
||||
|
||||
xkl_debug(150, "tmp XKB/XKM file names: [%s]/[%s]\n",
|
||||
xkb_fn, xkm_fn);
|
||||
@@ -296,14 +314,16 @@ xkl_config_get_keyboard(XklEngine * engine,
|
||||
break;
|
||||
case 0:
|
||||
/* child */
|
||||
+ opt_I = g_strdup_printf("-I%s", xkl_xkb_get_base_path());
|
||||
xkl_debug(160, "Executing %s\n", XKBCOMP);
|
||||
xkl_debug(160, "%s %s %s %s %s %s %s %s\n",
|
||||
XKBCOMP, XKBCOMP, "-w0", "-I",
|
||||
- "-I" XKB_BASE, "-xkm", xkb_fn,
|
||||
+ opt_I, "-xkm", xkb_fn,
|
||||
xkm_fn);
|
||||
execl(XKBCOMP, XKBCOMP, "-w0", "-I",
|
||||
- "-I" XKB_BASE, "-xkm", xkb_fn,
|
||||
+ opt_I, "-xkm", xkb_fn,
|
||||
xkm_fn, NULL);
|
||||
+ g_free(opt_I);
|
||||
xkl_debug(0, "Could not exec %s: %d\n",
|
||||
XKBCOMP, errno);
|
||||
exit(1);
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl
|
||||
, amtk, gnome3, gtk3, gtksourceview4, libuchardet, libxml2, pkgconfig }:
|
||||
let
|
||||
version = "4.2.1";
|
||||
version = "4.3.1";
|
||||
pname = "tepl";
|
||||
in stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0vib1ljgqwy2fhiwq8z3pcd68qy7v72l4f35p1d1w1k9z8sy677k";
|
||||
sha256 = "08y6vss29b65pqzv708cyqmbszgxsqqgw7g0vh6f1389ayi2lvs0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tpm2-tss";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1ryy6da3s91ks3m66y3xp6yh3v096kny0f9br74mxf2635n5g5kh";
|
||||
sha256 = "19jg09sxy3aj4dc1yv32jjv0m62cnmhjlw02jbh4d4pk2439m4l2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Mock hardware devices for creating unit tests";
|
||||
license = licenses.lgpl2;
|
||||
maintainers = with maintainers; [ ndowens ];
|
||||
maintainers = with maintainers; [];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unibilium";
|
||||
pname = "unibilium-unstable";
|
||||
|
||||
version = "2.0.0";
|
||||
version = "20190811";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mauke";
|
||||
owner = "neovim";
|
||||
repo = "unibilium";
|
||||
rev = "v${version}";
|
||||
sha256 = "1wa9a32wzqnxqh1jh554afj13dzjr6mw2wzqzw8d08nza9pg2ra2";
|
||||
rev = "92d929fabaf94ea4feb48149bbc3bbea77c4fab0";
|
||||
sha256 = "1l8p3fpdymba62x1f5d990v72z3m5f5g2yf505g0rlf2ysc5r1di";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ]
|
||||
|
||||
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
setSourceRoot = "export sourceRoot=${zookeeper.name}/src/c";
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=format-overflow" ];
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionals (!stdenv.isDarwin) [ "-Wno-error=format-overflow" ];
|
||||
|
||||
buildInputs = [ zookeeper bash ];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user