Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-04-19 18:11:51 +00:00 committed by GitHub
commit 6ef7c23763
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 512 additions and 279 deletions

View file

@ -9197,6 +9197,12 @@
fingerprint = "0EC3 FA89 EFBA B421 F82E 40B0 2567 6BCB FFAD 76B1";
}];
};
sophrosyne = {
email = "joshuaortiz@tutanota.com";
github = "sophrosyne97";
githubId = 53029739;
name = "Joshua Ortiz";
};
sorki = {
email = "srk@48.io";
github = "sorki";

View file

@ -41,8 +41,8 @@ in {
package = mkOption {
type = types.package;
default = pkgs.mxisd;
defaultText = "pkgs.mxisd";
default = pkgs.ma1sd;
defaultText = "pkgs.ma1sd";
description = "The mxisd/ma1sd package to use";
};

View file

@ -249,7 +249,15 @@ let
+ optionalString (ssl && vhost.http2) "http2 "
+ optionalString vhost.default "default_server "
+ optionalString (extraParameters != []) (concatStringsSep " " extraParameters)
+ ";";
+ ";"
+ (if ssl && vhost.http3 then ''
# UDP listener for **QUIC+HTTP/3
listen ${addr}:${toString port} http3 reuseport;
# Advertise that HTTP/3 is available
add_header Alt-Svc 'h3=":443"';
# Sent when QUIC was used
add_header QUIC-Status $quic;
'' else "");
redirectListen = filter (x: !x.ssl) defaultListen;

View file

@ -151,6 +151,19 @@ with lib;
'';
};
http3 = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable HTTP 3.
This requires using <literal>pkgs.nginxQuic</literal> package
which can be achived by setting <literal>services.nginx.package = pkgs.nginxQuic;</literal>.
Note that HTTP 3 support is experimental and
*not* yet recommended for production.
Read more at https://quic.nginx.org/
'';
};
root = mkOption {
type = types.nullOr types.path;
default = null;

View file

@ -6,25 +6,16 @@ import ./make-test-python.nix ({ pkgs, ... } : {
};
nodes = {
server_mxisd = args : {
server = args : {
services.mxisd.enable = true;
services.mxisd.matrix.domain = "example.org";
};
server_ma1sd = args : {
services.mxisd.enable = true;
services.mxisd.matrix.domain = "example.org";
services.mxisd.package = pkgs.ma1sd;
};
};
testScript = ''
start_all()
server_mxisd.wait_for_unit("mxisd.service")
server_mxisd.wait_for_open_port(8090)
server_mxisd.succeed("curl -Ssf 'http://127.0.0.1:8090/_matrix/identity/api/v1'")
server_ma1sd.wait_for_unit("mxisd.service")
server_ma1sd.wait_for_open_port(8090)
server_ma1sd.succeed("curl -Ssf 'http://127.0.0.1:8090/_matrix/identity/api/v1'")
server.wait_for_unit("mxisd.service")
server.wait_for_open_port(8090)
server.succeed("curl -Ssf 'http://127.0.0.1:8090/_matrix/identity/api/v1'")
'';
})

View file

@ -0,0 +1,35 @@
{ lib, stdenv, fetchFromGitHub, libX11, patches ? [ ], writeText, conf ? null }:
stdenv.mkDerivation {
pname = "dwmblocks";
version = "unstable-2020-12-27";
src = fetchFromGitHub {
owner = "torrinfail";
repo = "dwmblocks";
rev = "96cbb453e5373c05372fd4bf3faacfa53e409067";
sha256 = "00lxfxsrvhm60zzqlcwdv7xkqzya69mgpi2mr3ivzbc8s9h8nwqx";
};
buildInputs = [ libX11 ];
inherit patches;
postPatch =
let
configFile =
if lib.isDerivation conf || builtins.isPath conf
then conf else writeText "blocks.def.h" conf;
in
lib.optionalString (conf != null) "cp ${configFile} blocks.def.h";
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "Modular status bar for dwm written in c";
homepage = "https://github.com/torrinfail/dwmblocks";
license = licenses.isc;
maintainers = with maintainers; [ sophrosyne ];
platforms = platforms.all;
};
}

View file

@ -263,7 +263,6 @@ let
--suffix PATH ':' "$out${browser.execdir or "/bin"}" \
--set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \
--set MOZ_SYSTEM_DIR "$out/lib/mozilla" \
--set SNAP_NAME "firefox" \
--set MOZ_LEGACY_PROFILES 1 \
--set MOZ_ALLOW_DOWNGRADE 1 \
${lib.optionalString forceWayland ''

View file

@ -1,27 +1,16 @@
{ lib, fetchFromGitHub, fetchpatch, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, json-glib }:
{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, json-glib }:
stdenv.mkDerivation rec {
pname = "bitlbee-facebook";
version = "1.2.1";
version = "1.2.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "bitlbee";
repo = "bitlbee-facebook";
sha256 = "1yjhjhk3jzjip13lq009vlg84lm2lzwhac5jy0aq3vkcz6rp94rc";
sha256 = "1qiiiq17ybylbhwgbwsvmshb517589r8yy5rsh1rfaylmlcxyy7z";
};
# TODO: This patch should be included with the next release after v1.2.1
# these lines should be removed when this happens.
patches = [
(fetchpatch {
name = "FB_ORCA_AGENT_version_bump.patch";
url = "https://github.com/bitlbee/bitlbee-facebook/commit/49ea312d98b0578b9b2c1ff759e2cfa820a41f4d.patch";
sha256 = "0nzyyg8pw4f2jcickcpxq7r2la5wgl7q6iz94lhzybrkhss5753d";
}
)
];
nativeBuildInputs = [ autoconf automake libtool pkg-config ];
buildInputs = [ bitlbee json-glib ];

View file

@ -17,7 +17,7 @@ assert javahlBindings -> jdk != null && perl != null;
let
common = { version, sha256, extraBuildInputs ? [ ] }: stdenv.mkDerivation (rec {
common = { version, sha256 }: stdenv.mkDerivation (rec {
inherit version;
pname = "subversion";
@ -29,8 +29,7 @@ let
# Can't do separate $lib and $bin, as libs reference bins
outputs = [ "out" "dev" "man" ];
buildInputs = [ zlib apr aprutil sqlite openssl ]
++ extraBuildInputs
buildInputs = [ zlib apr aprutil sqlite openssl lz4 utf8proc ]
++ lib.optional httpSupport serf
++ lib.optional pythonBindings python
++ lib.optional perlBindings perl
@ -114,12 +113,10 @@ in {
subversion_1_10 = common {
version = "1.10.7";
sha256 = "1nhrd8z6c94sc0ryrzpyd98qdn5a5g3x0xv1kdb9da4drrk8y2ww";
extraBuildInputs = [ lz4 utf8proc ];
};
subversion = common {
version = "1.12.2";
sha256 = "0wgpw3kzsiawzqk4y0xgh1z93kllxydgv4lsviim45y5wk4bbl1v";
extraBuildInputs = [ lz4 utf8proc ];
};
}

View file

@ -81,6 +81,9 @@ let
# compatibility with NixOS
ln -s /host/etc/static static
# symlink nix config
ln -s /host/etc/nix nix
# symlink some NSS stuff
ln -s /host/etc/passwd passwd
ln -s /host/etc/group group

View file

@ -0,0 +1,33 @@
{ stdenv
, lib
, fetchFromGitHub
, gtk-engine-murrine
}:
stdenv.mkDerivation rec {
pname = "flat-remix-gtk";
version = "20201129";
src = fetchFromGitHub {
owner = "daniruiz";
repo = pname;
rev = version;
hash = "sha256-lAlHRVB/P3A1qWsXQZPZ3uhgctR4FLa+ocUrsbleXJU=";
};
dontBuild = true;
makeFlags = [ "PREFIX=$(out)" ];
propagatedUserEnvPkgs = [
gtk-engine-murrine
];
meta = with lib; {
description = "GTK application theme inspired by material design";
homepage = "https://drasite.com/flat-remix-gtk";
license = licenses.gpl3Only;
platforms = platforms.all;
maintainers = [ maintainers.mkg20001 ];
};
}

View file

@ -1,5 +1,4 @@
{ atk
, autoreconfHook
, cacert
, fetchpatch
, dbus
@ -42,32 +41,25 @@
, pciutils
, timezonemap
, libnma
, meson
, ninja
, gst_all_1
}:
let
libcroco = callPackage ./libcroco.nix { };
in
stdenv.mkDerivation rec {
pname = "cinnamon-common";
version = "4.6.1";
version = "4.8.6";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon";
rev = version;
sha256 = "149lhg953fa0glm250f76z2jzyaabh97jxiqkjnqvsk6bjk1d0bw";
hash = "sha256-4DMXQYH1/RjLhgrn55I7Vkk6+gGsR+OVmiwxVHUIyro=";
};
patches = [
# remove dbus-glib
(fetchpatch {
url = "https://github.com/linuxmint/cinnamon/commit/ce99760fa15c3de2e095b9a5372eeaca646fbed1.patch";
sha256 = "0p2sbdi5w7sgblqbgisb6f8lcj1syzq5vlk0ilvwaqayxjylg8gz";
})
(fetchpatch {
url = "https://leigh123linux.fedorapeople.org/pub/patches/new_cjs.patch";
sha256 = "07biv3vkbn3jzijbdrxcw73p8xz2djbsax014mlkvmryrmys0rg4";
})
./use-sane-install-dir.patch
./libdir.patch
];
buildInputs = [
@ -84,7 +76,6 @@ stdenv.mkDerivation rec {
glib
gtk3
json-glib
libcroco
libsoup
libstartup_notification
libXtst
@ -94,6 +85,7 @@ stdenv.mkDerivation rec {
polkit
libxml2
libgnomekbd
gst_all_1.gstreamer
# bindings
cairo
@ -114,23 +106,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
gobject-introspection
autoreconfHook
meson
ninja
wrapGAppsHook
intltool
gtk-doc
];
autoreconfPhase = ''
GTK_DOC_CHECK=false NOCONFIGURE=1 bash ./autogen.sh
'';
configureFlags = [ "--disable-static" "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt" "--with-libxml=${libxml2.dev}/include/libxml2" "--enable-gtk-doc=no" ];
postPatch = ''
substituteInPlace src/Makefile.am \
--replace "\$(libdir)/muffin" "${muffin}/lib/muffin"
patchShebangs autogen.sh
find . -type f -exec sed -i \
-e s,/usr/share/cinnamon,$out/share/cinnamon,g \
-e s,/usr/share/locale,/run/current-system/sw/share/locale,g \

View file

@ -1,33 +0,0 @@
{ lib, stdenv, fetchurl, pkg-config, libxml2, glib, gnome3 }:
stdenv.mkDerivation rec {
pname = "libcroco";
version = "0.6.13";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn";
};
outputs = [ "out" "dev" ];
outputBin = "dev";
configureFlags = lib.optional stdenv.isDarwin "--disable-Bsymbolic";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libxml2 glib ];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
};
meta = with lib; {
description = "GNOME CSS2 parsing and manipulation toolkit";
homepage = https://gitlab.gnome.org/GNOME/libcroco;
license = licenses.lgpl2;
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,25 @@
From 1c99ff9b042d77d97a0841c78fceb7cfbf41aa8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Sun, 28 Feb 2021 05:58:09 +0100
Subject: [PATCH] libdir patch
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 3c1e9a4f..a77d9b3c 100644
--- a/meson.build
+++ b/meson.build
@@ -14,7 +14,7 @@ includedir = get_option('includedir')
libexecdir = get_option('libexecdir')
desktopdir = join_paths(datadir, 'applications')
schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
-pkglibdir = join_paths(libdir, meson.project_name().to_lower())
+pkglibdir = libdir
servicedir = join_paths(datadir, 'dbus-1', 'services')
pkgdatadir = join_paths(datadir, meson.project_name().to_lower())
po_dir = join_paths(meson.source_root(), 'po')
--
2.30.0

View file

@ -0,0 +1,33 @@
From f7e802959d7a5c217ed574cab30404fc769f174d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Sat, 6 Feb 2021 14:26:26 +0100
Subject: [PATCH] use sane install dir
---
meson.build | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index bd803f20..3c1e9a4f 100644
--- a/meson.build
+++ b/meson.build
@@ -127,8 +127,14 @@ configure_file(
)
install_subdir(
- 'files',
- install_dir: '/',
+ 'files/usr',
+ install_dir: get_option('prefix'),
+ strip_directory: true,
+)
+
+install_subdir(
+ 'files/etc',
+ install_dir: join_paths(get_option('prefix'), 'etc'),
strip_directory: true,
)
--
2.30.0

View file

@ -1,11 +1,9 @@
{ lib, stdenv
, fetchFromGitHub
, pkg-config
, autoreconfHook
, glib
, gettext
, cinnamon-desktop
, intltool
, gtk3
, libnotify
, libxml2
@ -20,7 +18,7 @@
, libxklavier
, networkmanager
, libwacom
, libtool
, gnome3
, wrapGAppsHook
, tzdata
, glibc
@ -28,17 +26,19 @@
, modemmanager
, xorg
, gdk-pixbuf
, meson
, ninja
}:
stdenv.mkDerivation rec {
pname = "cinnamon-control-center";
version = "4.6.2";
version = "4.8.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "0fbgi2r2xikpa04k431qq9akngi9akyflq1kcks8f095qs5gsana";
hash = "sha256-vALThDY0uN9bV7b1fga3MK7b2/l5uL33+B2x6oSLPRE=";
};
buildInputs = [
@ -70,16 +70,11 @@ stdenv.mkDerivation rec {
./panels/datetime/tz.h:34:# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" */
postPatch = ''
patchShebangs ./autogen.sh
sed 's|TZ_DIR "/usr/share/zoneinfo/"|TZ_DIR "${tzdata}/share/zoneinfo/"|g' -i ./panels/datetime/test-timezone.c
sed 's|TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"|TZ_DATA_FILE "${tzdata}/share/zoneinfo/zone.tab"|g' -i ./panels/datetime/tz.h
sed 's|"/usr/share/i18n/locales/"|"${glibc}/share/i18n/locales/"|g' -i panels/datetime/test-endianess.c
'';
autoreconfPhase = ''
NOCONFIGURE=1 bash ./autogen.sh
'';
# it needs to have access to that file, otherwise we can't run tests after build
preBuild = ''
@ -87,19 +82,23 @@ stdenv.mkDerivation rec {
ln -s $PWD/panels/datetime $out/share/cinnamon-control-center/
'';
mesonFlags = [
"-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
];
preInstall = ''
rm -rfv $out
rm -r $out
'';
doCheck = true;
# the only test is wacom-calibrator and it seems to need an xserver and prob more services aswell
doCheck = false;
nativeBuildInputs = [
pkg-config
autoreconfHook
meson
ninja
wrapGAppsHook
gettext
intltool
libtool
];
meta = with lib; {

View file

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-desktop";
version = "4.6.4";
version = "4.8.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "08z5hgc6dwdp9fczm75axwh8q9665iz4y2lxp92xp62r3k0v9fvd";
hash = "sha256-FLruY1lxzB3iJ/So3jSjrbv9e8VoN/0+U2YDXju/u3E=";
};
outputs = [ "out" "dev" ];

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-menus";
version = "4.6.1";
version = "4.8.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "1qdaql4mknhzvl2qi1pyw4c820lqb7lg07gblh0wzfk4f7h8hddx";
hash = "sha256-9VSrqCjC8U3js1gqjl5QFctWYECATxN+AdfMdHLxYUY=";
};
buildInputs = [

View file

@ -23,27 +23,19 @@
, xapps
, xorg
, iso-flags-png-320x420
, fetchpatch
}:
stdenv.mkDerivation rec {
pname = "cinnamon-screensaver";
version = "4.6.0";
version = "4.8.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "068lh6wcmznfyvny7hx83q2rf4j96b6mv4a5v79y02k9110m7bsm";
hash = "sha256-gvSGxSYKnRqJhj2unRYRHp6qGw/O9SxKPzhw5xjCSSQ=";
};
patches = [
(fetchpatch {
url = "https://github.com/linuxmint/cinnamon-screensaver/pull/349/commits/4a9e5715f406bf2ca1aacddd5fd8f830102a423c.patch";
sha256 = "0fmkmskry4c88zcw0i8vsmh6q14k3m937hqi77p5xi1p93imr46y";
})
];
nativeBuildInputs = [
pkg-config
wrapGAppsHook

View file

@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-session";
version = "4.6.2";
version = "4.8.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "133vpgs0dqr16pvx5wyxhfcargn9wl14z0q99m2pn93hf6zycmsv";
hash = "sha256-lrwR8VSdPzHoc9MeBEQPbVfWNhPZDJ2wYizKSVpobmk=";
};
patches = [

View file

@ -1,4 +1,4 @@
From 6d71bf9764fb81d437678a603826167850bbf453 Mon Sep 17 00:00:00 2001
From 7fa408ebd72c9f1ff7ff4e9d7f4a811465a8a41b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Tue, 21 Jan 2020 03:19:28 +0100
Subject: [PATCH] fix: use an impure path to csd-backlight-helper to fix
@ -6,35 +6,35 @@ Subject: [PATCH] fix: use an impure path to csd-backlight-helper to fix
---
plugins/power/csd-power-manager.c | 4 ++--
.../org.cinnamon.settings-daemon.plugins.power.policy.in.in | 2 +-
.../org.cinnamon.settings-daemon.plugins.power.policy.in | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
index b24c456..212c47e 100755
index 33f4489..84dd98b 100644
--- a/plugins/power/csd-power-manager.c
+++ b/plugins/power/csd-power-manager.c
@@ -2519,7 +2519,7 @@ backlight_helper_get_value (const gchar *argument, CsdPowerManager* manager,
@@ -2529,7 +2529,7 @@ backlight_helper_get_value (const gchar *argument, CsdPowerManager* manager,
#endif
/* get the data */
- command = g_strdup_printf (LIBEXECDIR "/csd-backlight-helper --%s %s",
+ command = g_strdup_printf ("/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper --%s %s",
argument,
manager->priv->backlight_helper_preference_args);
ret = g_spawn_command_line_sync (command,
@@ -2609,7 +2609,7 @@ backlight_helper_set_value (const gchar *argument,
@@ -2619,7 +2619,7 @@ backlight_helper_set_value (const gchar *argument,
#endif
/* get the data */
- command = g_strdup_printf ("pkexec " LIBEXECDIR "/csd-backlight-helper --%s %i %s",
+ command = g_strdup_printf ("pkexec " "/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper --%s %i %s",
argument, value,
manager->priv->backlight_helper_preference_args);
ret = g_spawn_command_line_sync (command,
diff --git a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in
index 2c44e62..c0a2348 100755
--- a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in
+++ b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in
diff --git a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in
index 504f017..3569e8c 100644
--- a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in
+++ b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in
@@ -25,7 +25,7 @@
<allow_inactive>no</allow_inactive>
<allow_active>yes</allow_active>
@ -42,7 +42,8 @@ index 2c44e62..c0a2348 100755
- <annotate key="org.freedesktop.policykit.exec.path">@libexecdir@/csd-backlight-helper</annotate>
+ <annotate key="org.freedesktop.policykit.exec.path">/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper</annotate>
</action>
</policyconfig>
--
2.24.1
--
2.30.0

View file

@ -1,12 +1,9 @@
{ fetchFromGitHub
, autoconf-archive
, autoreconfHook
, cinnamon-desktop
, colord
, glib
, gsettings-desktop-schemas
, gtk3
, intltool
, lcms2
, libcanberra-gtk3
, libgnomekbd
@ -29,11 +26,15 @@
, tzdata
, nss
, libgudev
, meson
, ninja
, dbus
, dbus-glib
}:
stdenv.mkDerivation rec {
pname = "cinnamon-settings-daemon";
version = "4.6.4";
version = "4.8.5";
/* csd-power-manager.c:50:10: fatal error: csd-power-proxy.h: No such file or directory
#include "csd-power-proxy.h"
@ -48,14 +49,15 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "1xcjzjfwnzvkv9jiyw8adsjyhz92almzhyfwb91115774zgqnb7m";
hash = "sha256-PAWVTjGFs8yKXgNQ2ucDnEDS+n7bp2n3lhGl9gHXfdQ=";
};
patches = [
./csd-backlight-helper-fix.patch
./use-sane-install-dir.patch
];
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; # TODO: https://github.com/NixOS/nixpkgs/issues/36468
mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ];
buildInputs = [
cinnamon-desktop
@ -85,13 +87,14 @@ stdenv.mkDerivation rec {
fontconfig
nss
libgudev
dbus
dbus-glib
];
nativeBuildInputs = [
autoconf-archive
autoreconfHook
meson
ninja
wrapGAppsHook
intltool
pkg-config
];

View file

@ -0,0 +1,27 @@
From be57c01e6595a8e08ecc17de298e30640b532f11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Sat, 6 Feb 2021 13:55:03 +0100
Subject: [PATCH] use sane install-dir
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 0e11d50..54f4637 100644
--- a/meson.build
+++ b/meson.build
@@ -156,8 +156,8 @@ subdir('cinnamon-settings-daemon')
subdir('plugins')
install_subdir(
- 'files',
- install_dir: '/',
+ 'files/usr',
+ install_dir: get_option('prefix'),
strip_directory: true,
)
--
2.30.0

View file

@ -1,17 +1,18 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, gettext
}:
stdenv.mkDerivation rec {
pname = "cinnamon-translations";
version = "4.6.2";
version = "4.8.3";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "0zaghha62ibhg3rir6mrfy1z3v7p7v83b6glhmj9s51nxd86fyv6";
hash = "sha256-o/JFfwloXLUOy9YQzHtMCuzK7yBp/G43VS/RguxiTPY=";
};
nativeBuildInputs = [

View file

@ -2,7 +2,8 @@
, fetchFromGitHub
, gobject-introspection
, pkg-config
, lib, stdenv
, lib
, stdenv
, wrapGAppsHook
, python3
, cairo
@ -27,14 +28,14 @@
}:
stdenv.mkDerivation rec {
pname = "cjs-unstable";
version = "2020-10-19";
pname = "cjs";
version = "4.8.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cjs";
rev = "befc11adb5ba10681464e6fa81b1a79f108ce61c";
hash = "sha256-F2t8uKV2r29NxX2+3mYp5x1bug2lwihJZTK1dSS8rPg=";
rev = version;
hash = "sha256-6+zlWL0DmyP+RFp1ECA4XGbgYUlsMqqyTd6z46w99Ug=";
};
outputs = [ "out" "dev" ];

View file

@ -35,13 +35,13 @@
stdenv.mkDerivation rec {
pname = "muffin";
version = "4.6.3";
version = "4.8.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "1p8irzf20wari1id5rfx5sypywih1jsrmn0f83zlyhc5fxg02r5p";
hash = "sha256-zRW+hnoaKKTe4zIJpY1D0Ahc8k5zRbvYBF5Y4vZ6Rbs=";
};
buildInputs = [

View file

@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "nemo";
version = "4.6.5";
version = "4.8.4";
# TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327)
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "04rgdph9pxdj5wzzv2i0pgyhg3s74nh9jf1ry9z6v5bvv222ili4";
hash = "sha256-OOPjxYrYUd1PIRxRgHwYbm7ennmAChbXqcM8MEPKXO0=";
};
outputs = [ "out" "dev" ];

View file

@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec {
version = "1.0.8";
format = "other";
doCheck = false;
src = fetchFromGitHub {
owner = "linuxmint";

View file

@ -176,6 +176,7 @@ let
# Platform-specific flags
++ lib.optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}"
++ lib.optional targetPlatform.isNetBSD "--disable-libssp" # Provided by libc.
++ lib.optionals hostPlatform.isSunOS [
"--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
# On Illumos/Solaris GNU as is preferred

View file

@ -13,7 +13,8 @@ let
sha
dune_2
luv
ocaml_extlib
(if lib.versionAtLeast version "4.2"
then ocaml_extlib else ocaml_extlib-1-7-7)
] else with ocaml-ng.ocamlPackages_4_05; [
ocaml
camlp4
@ -125,6 +126,14 @@ in {
sed -i -re 's!(let +prefix_path += +).*( +in)!\1"'"$out/"'"\2!' src/main.ml
'';
};
haxe_4_0 = generic {
version = "4.0.5";
sha256 = "0f534pchdx0m057ixnk07ab4s518ica958pvpd0vfjsrxg5yjkqa";
};
haxe_4_1 = generic {
version = "4.1.5";
sha256 = "0rns6d28qzkbai6yyws08yzbyvxfn848nj0fsji7chdi0y7pzzj0";
};
haxe_4_2 = generic {
version = "4.2.1";
sha256 = "sha256-0j6M21dh8DB1gC/bPYNJrVuDbJyqQbP+61ItO5RBUcA=";

View file

@ -1,22 +1,39 @@
{ lib, stdenv, fetchgit, cmake, perl, go }:
{ lib
, stdenv
, fetchgit
, cmake
, ninja
, perl
, buildGoModule
}:
# reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md
stdenv.mkDerivation {
buildGoModule {
pname = "boringssl";
version = "2019-12-04";
version = "2021-04-18";
src = fetchgit {
url = "https://boringssl.googlesource.com/boringssl";
rev = "243b5cc9e33979ae2afa79eaa4e4c8d59db161d4";
sha256 = "1ak27dln0zqy2vj4llqsb99g03sk0sg25wlp09b58cymrh3gccvl";
rev = "468cde90ca58421d63f4dfeaebcf8bb3fccb4127";
sha256 = "0gaqcbvp6r5fq265mckmg0i0rjab0bhxkxcvfxp3ar5dm7q88w39";
};
nativeBuildInputs = [ cmake perl go ];
nativeBuildInputs = [ cmake ninja perl ];
makeFlags = [ "GOCACHE=$(TMPDIR)/go-cache" ];
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
# hack to get both go and cmake configure phase
# (if we use postConfigure then cmake will loop runHook postConfigure)
preBuild = ''
cmakeConfigurePhase
'';
buildPhase = ''
ninjaBuildPhase
'';
# CMAKE_OSX_ARCHITECTURES is set to x86_64 by Nix, but it confuses boringssl on aarch64-linux.
cmakeFlags = lib.optionals (stdenv.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ];
cmakeFlags = [ "-GNinja" ] ++ lib.optionals (stdenv.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ];
installPhase = ''
mkdir -p $bin/bin $out/include $out/lib

View file

@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ m4 which yasm ];
src = fetchurl {
url = "http://mpir.org/mpir-${version}.tar.bz2";
url = "https://mpir.org/mpir-${version}.tar.bz2";
sha256 = "1fvmhrqdjs925hzr2i8bszm50h00gwsh17p2kn2pi51zrxck9xjj";
};
configureFlags = [ "--enable-cxx" ];
configureFlags = [ "--enable-cxx" "--enable-fat" ];
meta = {
inherit version;
@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
license = lib.licenses.lgpl3Plus;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.unix;
downloadPage = "http://mpir.org/downloads.html";
homepage = "http://mpir.org/";
downloadPage = "https://mpir.org/downloads.html";
homepage = "https://mpir.org/";
updateWalker = true;
};
}

View file

@ -0,0 +1,11 @@
# Older version of extlib for Haxe 4.0 and 4.1.
# May be replaceable by the next extlib + extlib-base64 release.
{ fetchurl, ocaml_extlib }:
ocaml_extlib.overrideAttrs (_: rec {
version = "1.7.7";
src = fetchurl {
url = "https://github.com/ygrek/ocaml-extlib/releases/download/${version}/extlib-${version}.tar.gz";
sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1";
};
})

View file

@ -8,22 +8,19 @@
, nose
, pyopenssl
, pytestCheckHook
, pythonAtLeast
, pytz
, tzlocal
}:
buildPythonPackage rec {
pname = "aioimaplib";
version = "0.8.0";
disabled = pythonAtLeast "3.9";
version = "0.9.0";
src = fetchFromGitHub {
owner = "bamthomas";
repo = pname;
rev = version;
sha256 = "sha256-ume25EwLNB6szokHXonDXHGKVK76CiZYOBXVUf37/x8=";
sha256 = "sha256-xxZAeJDuqrPv4kGgDr0ypFuZJk1zcs/bmgeEzI0jpqY=";
};
checkInputs = [

View file

@ -9,18 +9,29 @@
buildPythonPackage rec {
pname = "PyMetno";
version = "0.8.1";
version = "0.8.2";
format = "setuptools";
src = fetchFromGitHub {
repo = pname;
owner = "Danielhiversen";
rev = version;
sha256 = "1jngf0mbn5hn166pqh1ga5snwwvv7n5kv1k9kaksrfibixkvpw6h";
sha256 = "0b1zm60yqj1mivc3zqw2qm9rqh8cbmx0r58jyyvm3pxzq5cafdg5";
};
propagatedBuildInputs = [ aiohttp async-timeout pytz xmltodict ];
propagatedBuildInputs = [
aiohttp
async-timeout
pytz
xmltodict
];
pythonImportsCheck = [ "metno"];
pythonImportsCheck = [
"metno"
];
# no tests
doCheck = false;
meta = with lib; {
description = "A library to communicate with the met.no api";

View file

@ -8,14 +8,14 @@
buildPythonPackage {
pname = "slob";
version = "unstable-2016-11-03";
version = "unstable-2020-06-26";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "itkach";
repo = "slob";
rev = "d1ed71e4778729ecdfc2fe27ed783689a220a6cd";
sha256 = "1r510s4r124s121wwdm9qgap6zivlqqxrhxljz8nx0kv0cdyypi5";
rev = "018588b59999c5c0eb42d6517fdb84036f3880cb";
sha256 = "01195hphjnlcvgykw143rf06s6y955sjc1r825a58vhjx7hj54zh";
};
propagatedBuildInputs = [ PyICU ];
@ -24,10 +24,11 @@ buildPythonPackage {
${python.interpreter} -m unittest slob
'';
pythonImportsCheck = [ "slob" ];
meta = with lib; {
homepage = "https://github.com/itkach/slob/";
description = "Reference implementation of the slob (sorted list of blobs) format";
license = licenses.gpl3;
license = licenses.gpl3Only;
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gops";
version = "0.3.17";
version = "0.3.18";
src = fetchFromGitHub {
owner = "google";
repo = "gops";
rev = "v${version}";
sha256 = "1l0k1v2wwwdrwwznrdq2ivbrl5z3hxa89xm89jlaglkd7jjg74zk";
sha256 = "0534jyravpsj73lgdmw6fns1qaqiw401jlfk04wa0as5sv09rfhy";
};
vendorSha256 = null;

View file

@ -16,13 +16,13 @@ let
in
stdenv.mkDerivation rec {
pname = "multilockscreen";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "jeffmhubbard";
repo = pname;
rev = "v${version}";
sha256 = "0gmnrq7ibbhiwsn7mfi2r71fwm6nvhiwf4wsyz44cscm474z83p0";
sha256 = "1vdai1ymkzlkh5l69s8zpyj2klzm8zyak00vd4p7lcldxfj861ig";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -710,7 +710,6 @@ let
MD = yes; # Device mapper (RAID, LVM, etc.)
# Enable initrd support.
BLK_DEV_RAM = yes;
BLK_DEV_INITRD = yes;
PM_TRACE_RTC = no; # Disable some expensive (?) features.

View file

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
let
version = "5.11.14";
version = "5.11.15";
suffix = "lqx1";
in
@ -14,7 +14,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
sha256 = "0kgr6c3mpc9nmg4m2qfk58bji95paq3jwqsyl3h55xk40gshka32";
sha256 = "1dwibknj4q8cd3mim679mrb4j8yi7p4q9qjcb4rwvw0yzgxmz3lv";
};
extraMeta = {

View file

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildLinux, ... } @ args:
let
version = "5.11.14";
version = "5.11.15";
suffix = "zen1";
in
@ -14,7 +14,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
sha256 = "1n49h9s3jyvrdy662b6j9xjbmhxxdczk980vrlgs09fg5ny0k59a";
sha256 = "0n9wm0lpwkqd79112k03lxp4hc898nvs2jjw3hxzggn5wk4i2dz9";
};
extraMeta = {

View file

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2021.4.5";
version = "2021.4.6";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];

View file

@ -23,7 +23,7 @@ let
# Override the version of some packages pinned in Home Assistant's setup.py
# Pinned due to API changes in astral>=2.0, required by the sun/moon plugins
# https://github.com/home-assistant/core/issues/36636
# https://github.com/home-assistant/core/pull/48573; Remove >= 2021.5
(mkOverride "astral" "1.10.1"
"d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1")
@ -51,6 +51,7 @@ let
"sha256-8bxn27DU1XUQUxQFJklEge29DHx1DMu7pJG4hVE1jDU=")
# Pinned due to API changes in pylilterbot>=2021.3.0
# https://github.com/home-assistant/core/pull/48300; Remove >= 2021.5
(self: super: {
pylitterbot = super.pylitterbot.overridePythonAttrs (oldAttrs: rec {
version = "2021.2.8";
@ -116,7 +117,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2021.4.5";
hassVersion = "2021.4.6";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@ -135,7 +136,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
sha256 = "106d1n9z8pfcnqm594vkhczrrrjap801w6fdr0psv5vhdxrqh4sj";
sha256 = "1s1slwcqls2prz9kgyhggs8xi3x7ghwdi33j983kvpg0gva7d2f0";
};
# leave this in, so users don't have to constantly update their downstream patch handling

View file

@ -0,0 +1,21 @@
{ callPackage, fetchhg, boringssl, ... } @ args:
callPackage ./generic.nix args {
src = fetchhg {
url = "https://hg.nginx.org/nginx-quic";
rev = "47a43b011dec"; # branch=quic
sha256 = "1d4d1v4zbnf5qlfl79pi7sficn1h7zm6kk7llm24yyhlsvssz10x";
};
preConfigure = ''
ln -s auto/configure configure
'';
configureFlags = [
"--with-http_v3_module"
"--with-http_quic_module"
"--with-stream_quic_module"
];
version = "quic";
}

View file

@ -1,70 +0,0 @@
{ lib, stdenv, fetchFromGitHub, jre, git, gradle_6, perl, makeWrapper }:
let
name = "mxisd-${version}";
version = "1.4.6";
rev = "6e9601cb3a18281857c3cefd20ec773023b577d2";
src = fetchFromGitHub {
inherit rev;
owner = "kamax-matrix";
repo = "mxisd";
sha256 = "07gpdgbz281506p2431qn92bvdza6ap3jfq5b7xdm7nwrry80pzd";
};
deps = stdenv.mkDerivation {
name = "${name}-deps";
inherit src;
nativeBuildInputs = [ gradle_6 perl git ];
buildPhase = ''
export MXISD_BUILD_VERSION=${rev}
export GRADLE_USER_HOME=$(mktemp -d);
gradle --no-daemon build -x test
'';
# perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
installPhase = ''
find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
| sh
'';
dontStrip = true;
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "0z9f3w7lfdvbk26kyckpbgas7mi98rjghck9w0kvx3r7k48p5vnv";
};
in
stdenv.mkDerivation {
inherit name src version;
nativeBuildInputs = [ gradle_6 perl makeWrapper ];
buildInputs = [ jre ];
patches = [ ./0001-gradle.patch ];
buildPhase = ''
export MXISD_BUILD_VERSION=${rev}
export GRADLE_USER_HOME=$(mktemp -d)
sed -ie "s#REPLACE#mavenLocal(); maven { url '${deps}' }#g" build.gradle
gradle --offline --no-daemon build -x test
'';
installPhase = ''
install -D build/libs/source.jar $out/lib/mxisd.jar
makeWrapper ${jre}/bin/java $out/bin/mxisd --add-flags "-jar $out/lib/mxisd.jar"
'';
meta = with lib; {
description = "a federated matrix identity server";
homepage = "https://github.com/kamax-matrix/mxisd";
license = licenses.agpl3;
maintainers = with maintainers; [ mguentner ];
platforms = platforms.all;
};
}

View file

@ -139,7 +139,7 @@ let
# Utility flags to test the type of platform.
inherit (hostPlatform)
isDarwin isLinux isSunOS isCygwin isFreeBSD isOpenBSD
isDarwin isLinux isSunOS isCygwin isBSD isFreeBSD isOpenBSD
isi686 isx86_32 isx86_64
is32bit is64bit
isAarch32 isAarch64 isMips isBigEndian;

View file

@ -0,0 +1,46 @@
{ stdenv
, cjdns
, nodejs
, makeWrapper
, lib
}:
stdenv.mkDerivation {
pname = "cjdns-tools";
version = cjdns.version;
src = cjdns.src;
buildInputs = [
nodejs
];
nativeBuildInputs = [
makeWrapper
];
buildPhase = ''
patchShebangs tools
sed -e "s|'password': 'NONE'|'password': Fs.readFileSync('/etc/cjdns.keys').toString().split('\\\\n').map(v => v.split('=')).filter(v => v[0] === 'CJDNS_ADMIN_PASSWORD').map(v => v[1])[0]|g" \
-i tools/lib/cjdnsadmin/cjdnsadmin.js
'';
installPhase = ''
mkdir -p $out/bin
cat ${./wrapper.sh} | sed "s|@@out@@|$out|g" > $out/bin/cjdns-tools
chmod +x $out/bin/cjdns-tools
cp -r tools $out/tools
find $out/tools -maxdepth 1 -type f -exec chmod -v a+x {} \;
cp -r node_modules $out/node_modules
'';
meta = with lib; {
homepage = "https://github.com/cjdelisle/cjdns";
description = "Tools for cjdns managment";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ mkg20001 ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,29 @@
#!/usr/bin/env bash
export PATH="@@out@@/tools:$PATH"
set -eo pipefail
if ! cat /etc/cjdns.keys >/dev/null 2>&1; then
echo "ERROR: No permission to read /etc/cjdns.keys (use sudo)" >&2
exit 1
fi
if [[ -z $1 ]]; then
echo "Cjdns admin"
echo "Usage: $0 <command> <args..>"
echo
echo "Commands:" $(find @@out@@/tools -maxdepth 1 -type f | sed -r "s|.+/||g")
_sh=$(which sh)
PATH="@@out@@/tools" PS1="cjdns\$ " "$_sh"
else
if [[ ! -e @@out@@/tools/$1 ]]; then
echo "ERROR: '$1' is not a valid tool" >&2
exit 2
else
"$@"
fi
fi

View file

@ -7,7 +7,7 @@
}:
let
usesX11 = stdenv.isLinux || stdenv.hostPlatform.isBSD;
usesX11 = stdenv.isLinux || stdenv.isBSD;
in
assert (x11Support && usesX11) -> xclip != null || xsel != null;

View file

@ -15,12 +15,12 @@ stdenv.mkDerivation rec {
sha256 = "04wl5k8k1ziqz7k5w0g7i6zdfn41pbh3k0m8vq434k1886inf8yn";
};
phases = [ "installPhase" ];
dontUnpack = true;
installPhase = ''
install -D "$src" "$out/share/java/${jarfilename}"
install -D $src $out/share/java/${jarfilename}
makeWrapper ${jre}/bin/java $out/bin/swagger-codegen \
makeWrapper ${jre}/bin/java $out/bin/${pname} \
--add-flags "-jar $out/share/java/${jarfilename}"
'';

View file

@ -0,0 +1,33 @@
{ lib, stdenv, fetchurl, jre, makeWrapper }:
stdenv.mkDerivation rec {
version = "3.0.25";
pname = "swagger-codegen";
jarfilename = "${pname}-cli-${version}.jar";
nativeBuildInputs = [
makeWrapper
];
src = fetchurl {
url = "https://repo1.maven.org/maven2/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}";
sha256 = "1rdz45kmmg60fs7ddnla1xq30nah6s6rd18fqbjbjxng8r92brnd";
};
dontUnpack = true;
installPhase = ''
install -D $src $out/share/java/${jarfilename}
makeWrapper ${jre}/bin/java $out/bin/${pname}3 \
--add-flags "-jar $out/share/java/${jarfilename}"
'';
meta = with lib; {
description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec";
homepage = "https://github.com/swagger-api/swagger-codegen/tree/3.0.0";
license = licenses.asl20;
maintainers = [ maintainers._1000101 ];
};
}

View file

@ -460,6 +460,7 @@ mapAliases ({
mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # added 2020-05-22
multipath_tools = multipath-tools; # added 2016-01-21
mupen64plus1_5 = mupen64plus; # added 2016-02-12
mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # added 2021-04-15
mysqlWorkbench = mysql-workbench; # added 2017-01-19
nagiosPluginsOfficial = monitoring-plugins;
ncat = nmap; # added 2016-01-26

View file

@ -3349,6 +3349,7 @@ in
};
cjdns = callPackage ../tools/networking/cjdns { };
cjdns-tools = callPackage ../tools/admin/cjdns-tools { };
cjson = callPackage ../development/libraries/cjson { };
@ -6109,8 +6110,6 @@ in
mxt-app = callPackage ../misc/mxt-app { };
mxisd = callPackage ../servers/mxisd { };
naabu = callPackage ../tools/security/naabu { };
nagstamon = callPackage ../tools/misc/nagstamon {
@ -8569,6 +8568,8 @@ in
swagger-codegen = callPackage ../tools/networking/swagger-codegen { };
swagger-codegen3 = callPackage ../tools/networking/swagger-codegen3 { };
swapview = callPackage ../os-specific/linux/swapview/default.nix { };
swec = callPackage ../tools/networking/swec { };
@ -10609,6 +10610,8 @@ in
inherit (callPackage ../development/compilers/haxe { })
haxe_4_2
haxe_4_1
haxe_4_0
haxe_3_4
haxe_3_2
;
@ -18685,6 +18688,15 @@ in
nginx = nginxStable;
nginxQuic = callPackage ../servers/http/nginx/quic.nix {
withPerl = false;
# We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334
modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];
# Use latest boringssl to allow http3 support
openssl = boringssl;
};
nginxStable = callPackage ../servers/http/nginx/stable.nix {
withPerl = false;
# We don't use `with` statement here on purpose!
@ -21142,6 +21154,7 @@ in
flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme {
inherit (plasma5Packages) breeze-icons;
};
flat-remix-gtk = callPackage ../data/themes/flat-remix-gtk { };
font-awesome_4 = (callPackage ../data/fonts/font-awesome-5 { }).v4;
font-awesome_5 = (callPackage ../data/fonts/font-awesome-5 { }).v5;
@ -22536,6 +22549,8 @@ in
dwm = callPackage ../applications/window-managers/dwm { };
dwmblocks = callPackage ../applications/misc/dwmblocks { };
dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { };
dynamips = callPackage ../applications/virtualization/dynamips { };

View file

@ -1018,7 +1018,11 @@ let
ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { };
ocaml_extlib = callPackage ../development/ocaml-modules/extlib { };
ocaml_extlib = ocaml_extlib-1-7-8;
ocaml_extlib-1-7-8 = callPackage ../development/ocaml-modules/extlib { };
ocaml_extlib-1-7-7 = callPackage ../development/ocaml-modules/extlib/1.7.7.nix { };
ocb-stubblr = callPackage ../development/ocaml-modules/ocb-stubblr { };