Merge master into staging-next

main
github-actions[bot] 2 years ago committed by GitHub
commit cdd0c54f10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 22
      nixos/doc/manual/development/writing-nixos-tests.section.md
  2. 26
      nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml
  3. 14
      nixos/lib/test-driver/default.nix
  4. 8
      nixos/lib/testing-python.nix
  5. 14
      nixos/modules/services/misc/uhub.nix
  6. 1
      nixos/tests/all-tests.nix
  7. 13
      nixos/tests/extra-python-packages.nix
  8. 4
      pkgs/applications/graphics/ImageMagick/7.0.nix
  9. 26
      pkgs/applications/misc/prusa-slicer/default.nix
  10. 6
      pkgs/applications/misc/prusa-slicer/super-slicer.nix
  11. 6
      pkgs/applications/networking/browsers/chromium/upstream-info.json
  12. 5
      pkgs/applications/networking/browsers/dillo/default.nix
  13. 7
      pkgs/applications/networking/irc/ircdog/default.nix
  14. 5
      pkgs/applications/window-managers/oroborus/default.nix
  15. 1
      pkgs/data/fonts/iosevka/default.nix
  16. 30
      pkgs/development/compilers/ispc/default.nix
  17. 4
      pkgs/development/libraries/olm/default.nix
  18. 4
      pkgs/development/nim-packages/markdown/default.nix
  19. 2
      pkgs/development/node-packages/node-packages.json
  20. 2367
      pkgs/development/node-packages/node-packages.nix
  21. 22
      pkgs/development/ocaml-modules/dtools/default.nix
  22. 22
      pkgs/development/ocaml-modules/duppy/default.nix
  23. 23
      pkgs/development/ocaml-modules/lo/default.nix
  24. 26
      pkgs/development/ocaml-modules/magic/default.nix
  25. 4
      pkgs/development/python-modules/pycep-parser/default.nix
  26. 80
      pkgs/os-specific/linux/kernel/xanmod-kernels.nix
  27. 27
      pkgs/tools/text/seehecht/default.nix
  28. 2
      pkgs/top-level/all-packages.nix
  29. 8
      pkgs/top-level/ocaml-packages.nix

@ -393,3 +393,25 @@ with foo_running:
def foo_running():
machine.succeed("pgrep -x foo")
```
## Adding Python packages to the test script {#ssec-python-packages-in-test-script}
When additional Python libraries are required in the test script, they can be
added using the parameter `extraPythonPackages`. For example, you could add
`numpy` like this:
```nix
import ./make-test-python.nix
{
extraPythonPackages = p: [ p.numpy ];
nodes = { };
testScript = ''
import numpy as np
assert str(np.zeros(4) == "array([0., 0., 0., 0.])")
'';
}
```
In that case, `numpy` is chosen from the generic `python3Packages`.

@ -665,4 +665,30 @@ def foo_running():
```
</programlisting>
</section>
<section xml:id="ssec-python-packages-in-test-script">
<title>Adding Python packages to the test script</title>
<para>
When additional Python libraries are required in the test script,
they can be added using the parameter
<literal>extraPythonPackages</literal>. For example, you could add
<literal>numpy</literal> like this:
</para>
<programlisting language="bash">
import ./make-test-python.nix
{
extraPythonPackages = p: [ p.numpy ];
nodes = { };
testScript = ''
import numpy as np
assert str(np.zeros(4) == &quot;array([0., 0., 0., 0.])&quot;)
'';
}
</programlisting>
<para>
In that case, <literal>numpy</literal> is chosen from the generic
<literal>python3Packages</literal>.
</para>
</section>
</section>

@ -10,6 +10,7 @@
, socat
, tesseract4
, vde2
, extraPythonPackages ? (_ : [])
}:
python3Packages.buildPythonApplication rec {
@ -17,8 +18,17 @@ python3Packages.buildPythonApplication rec {
version = "1.1";
src = ./.;
propagatedBuildInputs = [ coreutils netpbm python3Packages.colorama python3Packages.ptpython qemu_pkg socat vde2 ]
++ (lib.optionals enableOCR [ imagemagick_light tesseract4 ]);
propagatedBuildInputs = [
coreutils
netpbm
python3Packages.colorama
python3Packages.ptpython
qemu_pkg
socat
vde2
]
++ (lib.optionals enableOCR [ imagemagick_light tesseract4 ])
++ extraPythonPackages python3Packages;
doCheck = true;
checkInputs = with python3Packages; [ mypy pylint black ];

@ -53,12 +53,13 @@ rec {
, skipTypeCheck ? false
, passthru ? {}
, interactive ? false
, extraPythonPackages ? (_ :[])
}:
let
# Reifies and correctly wraps the python test driver for
# the respective qemu version and with or without ocr support
testDriver = pkgs.callPackage ./test-driver {
inherit enableOCR;
inherit enableOCR extraPythonPackages;
qemu_pkg = qemu_test;
imagemagick_light = imagemagick_light.override { inherit libtiff; };
tesseract4 = tesseract4.override { enableLanguages = [ "eng" ]; };
@ -184,6 +185,7 @@ rec {
(if meta.description or null != null
then builtins.unsafeGetAttrPos "description" meta
else builtins.unsafeGetAttrPos "testScript" t)
, extraPythonPackages ? (_ : [])
} @ t:
let
mkNodes = qemu_pkg:
@ -236,13 +238,13 @@ rec {
);
driver = setupDriverForTest {
inherit testScript enableOCR skipTypeCheck skipLint passthru;
inherit testScript enableOCR skipTypeCheck skipLint passthru extraPythonPackages;
testName = name;
qemu_pkg = pkgs.qemu_test;
nodes = mkNodes pkgs.qemu_test;
};
driverInteractive = setupDriverForTest {
inherit testScript enableOCR skipTypeCheck skipLint passthru;
inherit testScript enableOCR skipTypeCheck skipLint passthru extraPythonPackages;
testName = name;
qemu_pkg = pkgs.qemu;
nodes = mkNodes pkgs.qemu;

@ -80,11 +80,12 @@ in {
tls_enable = cfg.enableTLS;
file_plugins = pkgs.writeText "uhub-plugins.conf"
(lib.strings.concatStringsSep "\n" (map ({ plugin, settings }:
"plugin ${plugin} ${
toString
(lib.attrsets.mapAttrsToList (key: value: ''"${key}=${value}"'')
settings)
}") cfg.plugins));
''
plugin ${plugin} "${
toString
(lib.attrsets.mapAttrsToList (key: value: "${key}=${value}")
settings)
}"'') cfg.plugins));
};
in {
name = "uhub/${name}.conf";
@ -104,6 +105,9 @@ in {
ExecStart = "${pkg}/bin/uhub -c /etc/uhub/${name}.conf -L";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
DynamicUser = true;
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
CapabilityBoundingSet = "CAP_NET_BIND_SERVICE";
};
};
}) hubs;

@ -166,6 +166,7 @@ let
etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {};
etebase-server = handleTest ./etebase-server.nix {};
etesync-dav = handleTest ./etesync-dav.nix {};
extra-python-packages = handleTest ./extra-python-packages.nix {};
fancontrol = handleTest ./fancontrol.nix {};
fcitx = handleTest ./fcitx {};
fenics = handleTest ./fenics.nix {};

@ -0,0 +1,13 @@
import ./make-test-python.nix ({ ... }:
{
name = "extra-python-packages";
extraPythonPackages = p: [ p.numpy ];
nodes = { };
testScript = ''
import numpy as np
assert str(np.zeros(4) == "array([0., 0., 0., 0.])")
'';
})

@ -45,13 +45,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "7.1.0-36";
version = "7.1.0-37";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
hash = "sha256-fl83O3vVHp12+Vj3WT0NOWe5a6ufmtFlxVlbUhIzfB0=";
hash = "sha256-Okp3oPIAEXl+fTnEw0jufSxcRU6ip+on5/IyGEjzx2E=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

@ -1,8 +1,22 @@
{ stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem, pkg-config, wrapGAppsHook
, boost, cereal, cgal_5, curl, dbus, eigen, expat, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme
, ilmbase, libpng, mpfr, nlopt, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg, fetchpatch
}:
stdenv.mkDerivation rec {
{ stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem
, pkg-config, wrapGAppsHook, boost, cereal, cgal_5, curl, dbus, eigen, expat
, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme, ilmbase, libpng, mpfr, nlopt
, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg, fetchpatch
, wxGTK31-gtk3-override ? null }:
let
wxGTK31-gtk3-prusa = wxGTK31-gtk3.overrideAttrs (old: rec {
pname = "wxwidgets-prusa3d-patched";
version = "3.1.4";
src = fetchFromGitHub {
owner = "prusa3d";
repo = "wxWidgets";
rev = "489f6118256853cf5b299d595868641938566cdb";
hash = "sha256-xGL5I2+bPjmZGSTYe1L7VAmvLHbwd934o/cxg9baEvQ=";
fetchSubmodules = true;
};
});
wxGTK31-gtk3-override' = if wxGTK31-gtk3-override == null then wxGTK31-gtk3-prusa else wxGTK31-gtk3-override;
in stdenv.mkDerivation rec {
pname = "prusa-slicer";
version = "2.4.2";
@ -34,7 +48,7 @@ stdenv.mkDerivation rec {
pcre
systemd
tbb
wxGTK31-gtk3
wxGTK31-gtk3-override'
xorg.libX11
] ++ checkInputs;

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, makeDesktopItem, prusa-slicer }:
{ lib, fetchFromGitHub, makeDesktopItem, prusa-slicer, wxGTK31-gtk3 }:
let
appname = "SuperSlicer";
pname = "super-slicer";
@ -54,7 +54,7 @@ let
passthru = allVersions;
};
allVersions = builtins.mapAttrs (_name: version: (prusa-slicer.overrideAttrs (override version))) versions;
prusa-slicer' = prusa-slicer.override { wxGTK31-gtk3-override = wxGTK31-gtk3; };
allVersions = builtins.mapAttrs (_name: version: (prusa-slicer'.overrideAttrs (override version))) versions;
in
allVersions.stable

@ -19,9 +19,9 @@
}
},
"beta": {
"version": "103.0.5060.24",
"sha256": "1vdnq7vd0jdxkpc00xwvvk1mmyq2hcydms64l16nv3v8jgvizrha",
"sha256bin64": "1rnjgb9v8dr74x0lj00xdkpvp2yx8d79h1kdzp7m7nvh4q34s32w",
"version": "103.0.5060.33",
"sha256": "00s9nwy5y2vik08snqxv1wbajllb7d81bryl5v4miyihjs511zjb",
"sha256bin64": "1l1fmfsl6ms4ps6sixp6chq3p6spik2fsvz5njvj1zf84p90mx4l",
"deps": {
"gn": {
"version": "2022-05-11",

@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
buildInputs = with lib;
[ perl fltk openssl libjpeg libpng libXcursor libXi libXinerama ];
# Workaround build failure on -fno-common toolchains:
# ld: main.o:/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set';
# dpid.o:/build/dillo-3.0.5/dpid/dpid.h:64: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
configureFlags = [ "--enable-ssl" ];
meta = with lib; {

@ -1,14 +1,12 @@
{ lib
, buildGoPackage
, buildGoModule
, fetchFromGitHub
}:
buildGoPackage rec {
buildGoModule rec {
pname = "ircdog";
version = "0.3.0";
goPackagePath = "github.com/ergochat/ircdog";
src = fetchFromGitHub {
owner = "goshuirc";
repo = pname;
@ -16,6 +14,7 @@ buildGoPackage rec {
sha256 = "sha256-x3ihWLgVYu17vG1xQTgIr4TSkeZ467TZBV1fPTPnZgw=";
fetchSubmodules = true;
};
vendorSha256 = null;
meta = with lib; {
description = "ircdog is a simple wrapper over the raw IRC protocol that can respond to pings, and interprets formatting codes";

@ -46,6 +46,11 @@ stdenv.mkDerivation rec {
xorgproto
];
# Workaround build failure on -fno-common toolchains:
# ld: workspaces.o:src/keyboard.h:93: multiple definition of
# `NumLockMask'; client.o:src/keyboard.h:93: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
meta = with lib; {
homepage = "https://web.archive.org/web/20191129172107/https://www.oroborus.org/";
description = "A really minimalistic X window manager";

@ -99,6 +99,7 @@ stdenv.mkDerivation rec {
'';
buildPhase = ''
export HOME=$TMPDIR
runHook preBuild
npm run build --no-update-notifier -- --jCmd=$NIX_BUILD_CORES ttf::$pname >/dev/null
runHook postBuild

@ -1,41 +1,29 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
, cmake, which, m4, python3, bison, flex, llvmPackages
, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses
# the default test target is sse4, but that is not supported by all Hydra agents
, testedTargets ? [ "sse2" ]
, testedTargets ? [ "sse2-i32x4" ]
}:
stdenv.mkDerivation rec {
pname = "ispc";
version = "unstable-2021-04-02";
version = "1.18.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
# ISPC release 1.15.0 doesn't build against LLVM 11.1, only against 11.0. So we
# use latest ISPC main branch for now, until they support an LLVM version we have.
# https://github.com/ispc/ispc/issues/2027#issuecomment-784470530
rev = "3e8313568265d2adfbf95bd6b6e1a4c70ef59bed";
sha256 = "sha256-gvr+VpoacmwQlP5gT4MnfmKdACZWJduVMIpR0YRzseg=";
rev = "v${version}";
sha256 = "sha256-eI/zUhZDTd2SiFltjrs8kxvQQOPHpqhArGyOW+och3E=";
};
patches = [
# Fix cmake error: `Failed to find clang++`
# https://github.com/ispc/ispc/pull/2055
(fetchpatch {
url = "https://github.com/erictapen/ispc/commit/338119b2f4e11fcf0b0852de296c320928e572a2.patch";
sha256 = "sha256-+RqDq1LMWomu/K4SgK0Nip47b1RwyM6W0cTSNGD4+m4=";
})
];
nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.llvm.dev ];
nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev ];
buildInputs = with llvmPackages; [
llvm llvmPackages.libclang
libllvm libclang openmp ncurses
];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace curses ncurses
--replace CURSES_CURSES_LIBRARY CURSES_NCURSES_LIBRARY
substituteInPlace cmake/GenerateBuiltins.cmake \
--replace 'bit 32 64' 'bit 64'
'';
@ -78,6 +66,6 @@ stdenv.mkDerivation rec {
description = "Intel 'Single Program, Multiple Data' Compiler, a vectorised language";
license = licenses.bsd3;
platforms = [ "x86_64-linux" "x86_64-darwin" ]; # TODO: buildable on more platforms?
maintainers = with maintainers; [ aristid thoughtpolice ];
maintainers = with maintainers; [ aristid thoughtpolice athas ];
};
}

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "olm";
version = "3.2.10";
version = "3.2.11";
src = fetchFromGitLab {
domain = "gitlab.matrix.org";
owner = "matrix-org";
repo = pname;
rev = version;
sha256 = "0v0w98m11r2rqvlrxssnzhqkaxmpbi5s3rkk3csfzhhkpgiv46km";
sha256 = "sha256-/ozMvcHDhYruhzp8xfskKOYCbe/vS4pEOPn1+1Pb+Q0=";
};
nativeBuildInputs = [ cmake ];

@ -3,6 +3,6 @@
fetchFromGitHub {
owner = "soasme";
repo = "nim-markdown";
rev = "abdbe5e";
sha256 = "0f3c1sxvhbbds43c9l8cz69pfpf984msj1lv4pb7bzpxb5zil2wy";
rev = "a661c26";
hash = "sha256-/GkCSOmg2JxQhiDS8vgnKIoKvVgld/uIilUHslvwMnk=";
}

@ -166,7 +166,7 @@
, "insect"
, "intelephense"
, "ionic"
, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v14.0.1.tar.gz"}
, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v15.5.0.tar.gz"}
, "jake"
, "javascript-typescript-langserver"
, "joplin"

File diff suppressed because it is too large Load Diff

@ -0,0 +1,22 @@
{ lib, buildDunePackage, fetchFromGitHub }:
buildDunePackage rec {
pname = "dtools";
version = "0.4.4";
minimalOCamlVersion = "4.05";
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-dtools";
rev = "v${version}";
sha256 = "1xbgnij63crikfr2jvar6sf6c7if47qarg5yycdfidip21vhmawf";
};
meta = with lib; {
homepage = "https://github.com/savonet/ocaml-dtools";
description = "Library providing various helper functions to make daemons";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dandellion ];
};
}

@ -0,0 +1,22 @@
{ lib, buildDunePackage, fetchFromGitHub, ocaml_pcre }:
buildDunePackage rec {
pname = "duppy";
version = "0.9.2";
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-duppy";
rev = "v${version}";
sha256 = "132dawca1p5s965m40ldmnihlpgfm47y62kfbzgim7sgsdwxxw5y";
};
propagatedBuildInputs = [ ocaml_pcre ];
meta = with lib; {
homepage = "https://github.com/savonet/ocaml-duppy";
description = "Library providing monadic threads";
license = licenses.lgpl21Only;
maintainers = with maintainers; [ dandellion ];
};
}

@ -0,0 +1,23 @@
{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, liblo }:
buildDunePackage rec {
pname = "lo";
version = "0.2.0";
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-lo";
rev = "v${version}";
sha256 = "0mi8h6f6syxjkxz493l5c3l270pvxx33pz0k3v5465wqjsnppar2";
};
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ liblo ];
meta = with lib; {
homepage = "https://github.com/savonet/ocaml-lo";
description = "Bindings for LO library";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ dandellion ];
};
}

@ -0,0 +1,26 @@
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, which, file }:
stdenv.mkDerivation rec {
pname = "magic";
version = "0.7.3";
src = fetchFromGitHub {
owner = "Chris00";
repo = "ocaml-magic";
rev = "510c473d222a3d3d900b8ae1892d13e0d49d08be"; # no tags in repo
sha256 = "0qks3v51xvzxhidai414mbszxhcl8wg8g7zxd04qi260433g77yg";
};
createFindlibDestdir = true;
nativeBuildInputs = [ which ];
buildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ file ];
meta = with lib; {
homepage = "https://github.com/Chris00/ocaml-magic";
description = "Bindings for libmagic";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ dandellion ];
};
}

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pycep-parser";
version = "0.3.6";
version = "0.3.7";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "gruebel";
repo = "pycep";
rev = "refs/tags/${version}";
hash = "sha256-v8GJHwkY4FFmqPzEfFdvYhxj9G/H74KkhyM40K+mQ3A=";
hash = "sha256-5XivzmwcJi+DrrskM0u3XBXtC5j0pjXbWHI+8mciMXM=";
};
nativeBuildInputs = [

@ -2,15 +2,15 @@
let
stableVariant = {
version = "5.15.40";
version = "5.15.43";
suffix = "xanmod1";
hash = "sha256-P9pRPfzBVQNhWp6ulDiBgV/ki2C0CTbIRV6KRhUD+vQ=";
hash = "sha256-MeH9RUPDiuN22eAZ18v+N3aIT18dQ3FnTkcQV0MjB4k=";
};
edgeVariant = {
version = "5.17.8";
version = "5.18.1";
suffix = "xanmod1";
hash = "sha256-Q8YmBeocolr6Ds2inwV299Td6/zE8RTA1SWve5ZykAs=";
hash = "sha256-dqvB4F2S7cklSJ7XTUNvWVKTsZGLevOXME5lvhmfyis=";
};
xanmodKernelFor = { version, suffix, hash }: buildLinux (args // rec {
@ -24,48 +24,54 @@ let
inherit hash;
};
structuredExtraConfig = with lib.kernel; {
# removed options
CFS_BANDWIDTH = lib.mkForce (option no);
RT_GROUP_SCHED = lib.mkForce (option no);
SCHED_AUTOGROUP = lib.mkForce (option no);
structuredExtraConfig =
with lib.kernel;
with (lib.kernel.whenHelpers version);
{
# TODO: remove this once https://github.com/NixOS/nixpkgs/pull/175433 is in master
WERROR = no;
# AMD P-state driver
X86_AMD_PSTATE = yes;
# removed options
CFS_BANDWIDTH = lib.mkForce (option no);
RT_GROUP_SCHED = lib.mkForce (option no);
SCHED_AUTOGROUP = lib.mkForce (option no);
# Linux RNG framework
LRNG = yes;
# AMD P-state driver
X86_AMD_PSTATE = yes;
# Paragon's NTFS3 driver
NTFS3_FS = module;
NTFS3_LZX_XPRESS = yes;
NTFS3_FS_POSIX_ACL = yes;
# Linux RNG framework
LRNG = whenOlder "5.18" yes;
# Preemptive Full Tickless Kernel at 500Hz
SCHED_CORE = lib.mkForce (option no);
PREEMPT_VOLUNTARY = lib.mkForce no;
PREEMPT = lib.mkForce yes;
NO_HZ_FULL = yes;
HZ_500 = yes;
# Paragon's NTFS3 driver
NTFS3_FS = module;
NTFS3_LZX_XPRESS = yes;
NTFS3_FS_POSIX_ACL = yes;
# Google's BBRv2 TCP congestion Control
TCP_CONG_BBR2 = yes;
DEFAULT_BBR2 = yes;
# Preemptive Full Tickless Kernel at 500Hz
SCHED_CORE = lib.mkForce (option no);
PREEMPT_VOLUNTARY = lib.mkForce no;
PREEMPT = lib.mkForce yes;
NO_HZ_FULL = yes;
HZ_500 = yes;
# FQ-PIE Packet Scheduling
NET_SCH_DEFAULT = yes;
DEFAULT_FQ_PIE = yes;
# Google's BBRv2 TCP congestion Control
TCP_CONG_BBR2 = yes;
DEFAULT_BBR2 = yes;
# Graysky's additional CPU optimizations
CC_OPTIMIZE_FOR_PERFORMANCE_O3 = yes;
# FQ-PIE Packet Scheduling
NET_SCH_DEFAULT = yes;
DEFAULT_FQ_PIE = yes;
# Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync.
FUTEX = yes;
FUTEX_PI = yes;
# Graysky's additional CPU optimizations
CC_OPTIMIZE_FOR_PERFORMANCE_O3 = yes;
# WineSync driver for fast kernel-backed Wine
WINESYNC = module;
};
# Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync.
FUTEX = yes;
FUTEX_PI = yes;
# WineSync driver for fast kernel-backed Wine
WINESYNC = module;
};
extraMeta = {
branch = lib.versions.majorMinor version;

@ -0,0 +1,27 @@
{ lib, rustPlatform, fetchFromGitea }:
rustPlatform.buildRustPackage rec {
pname = "seehecht";
version = "3.0.2";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "papojari";
repo = "seehecht";
rev = "v${version}";
sha256 = "sha256-x5zZEDaBmWpyvY+sKuiK4L+hc85prxCueWYUNMi9ty0=";
};
cargoSha256 = "sha256-mWGmMtUYeM97SM+/jtOzkAe1usuZT4yOI6PAbiGKe7M=";
postInstall = ''
ln -s $out/bin/seh $out/bin/seehecht
'';
meta = with lib; {
description = "A tool to quickly open a markdown document with already filled out frontmatter";
license = licenses.lgpl3Only;
platforms = platforms.all;
maintainers = with maintainers; [ papojari ];
};
}

@ -10179,6 +10179,8 @@ with pkgs;
securefs = callPackage ../tools/filesystems/securefs { };
seehecht = callPackage ../tools/text/seehecht { };
seexpr = callPackage ../development/compilers/seexpr { };
setroot = callPackage ../tools/X11/setroot { };

@ -314,6 +314,8 @@ let
dtoa = callPackage ../development/ocaml-modules/dtoa { };
dtools = callPackage ../development/ocaml-modules/dtools { };
duff = callPackage ../development/ocaml-modules/duff { };
dum = callPackage ../development/ocaml-modules/dum { };
@ -347,6 +349,8 @@ let
dune-site = callPackage ../development/ocaml-modules/dune-site { };
duppy = callPackage ../development/ocaml-modules/duppy { };
duration = callPackage ../development/ocaml-modules/duration { };
dyn = callPackage ../development/ocaml-modules/dyn { };
@ -694,6 +698,8 @@ let
libllvm = pkgs.llvmPackages_10.libllvm;
};
lo = callPackage ../development/ocaml-modules/lo { };
logs = callPackage ../development/ocaml-modules/logs { };
lru = callPackage ../development/ocaml-modules/lru { };
@ -738,6 +744,8 @@ let
macaque = callPackage ../development/ocaml-modules/macaque { };
magic = callPackage ../development/ocaml-modules/magic { };
magic-mime = callPackage ../development/ocaml-modules/magic-mime { };
mariadb = callPackage ../development/ocaml-modules/mariadb {

Loading…
Cancel
Save