diff options
Diffstat (limited to '')
| -rw-r--r-- | pkgs/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/hikari.nix | 31 | ||||
| -rw-r--r-- | pkgs/overlay.nix | 55 | ||||
| -rw-r--r-- | pkgs/patches/element-css.patch | 28 | ||||
| -rw-r--r-- | pkgs/plover/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/plover/plover-dev.nix | 73 | ||||
| -rw-r--r-- | pkgs/plover/plover-stroke.nix | 39 | ||||
| -rw-r--r-- | pkgs/plover/plover.nix | 96 | ||||
| -rw-r--r-- | pkgs/plover/rtf_tokenize.nix | 33 |
9 files changed, 53 insertions, 318 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix index ce35fc2..5563b52 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,12 +2,11 @@ { inherit (nixpkgs) - galmon-core galmon-full almanac rustex - kijetesantakaluotokieni showrt isabelle-utils isabat - travelynx crs-tracker crs-php bahnhof-name matrix-to - hikari_unstable heartwood radicle-interface radicle-tui - inweb nomsring bookwyrm mollysocket git-annex-remote-remarkable2 - ntfy-matrix-bot transport_validator mergiraf git-who plover plover-dev; + galmon-core galmon-full almanac rustex kijetesantakaluotokieni showrt + isabelle-utils isabat travelynx crs-tracker crs-php bahnhof-name matrix-to + hikari heartwood radicle-interface radicle-tui inweb nomsring bookwyrm + mollysocket git-annex-remote-remarkable2 ntfy-matrix-bot transport_validator + mergiraf git-who plover plover-dev tracktrain; pkgs = nixpkgs; } diff --git a/pkgs/hikari.nix b/pkgs/hikari.nix index afbc335..e096b5a 100644 --- a/pkgs/hikari.nix +++ b/pkgs/hikari.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchzip -, pkg-config, bmake +{ lib, stdenv, fetchgit +, pkg-config , cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman , libucl, wayland, wayland-protocols, wayland-scanner, wlroots, mesa -, libdrm, libgbm +, libdrm, libgbm, ninja, libxcb-wm, meson , features ? { gammacontrol = true; layershell = true; @@ -13,14 +13,15 @@ stdenv.mkDerivation rec { pname = "hikari"; - version = "2.3.3"; + version = "3.0.0"; - src = fetchzip { - url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-5Ug0U3ESC5F/gj7bahnLYkeY/weSCj0QASwdFuWwdMI="; + src = fetchgit { + url = "https://codeberg.org/thomasadam/hikari"; + rev = version; + hash = "sha256-gcD0VYIqGoArvRcDpS0BYGDwuxVJZYQpuvv0is6dozM="; }; - nativeBuildInputs = [ pkg-config bmake ]; + nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = [ cairo @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { libevdev libinput libxkbcommon + libxcb-wm libdrm libgbm linux-pam @@ -41,22 +43,9 @@ stdenv.mkDerivation rec { wlroots ]; - patches = [ ./patches/hikari-gtk4.patch ]; - enableParallelBuilding = true; - makeFlags = with lib; [ "PREFIX=$(out)" "DEBUG=YES" ] - ++ optional stdenv.isLinux "WITH_POSIX_C_SOURCE=YES" - ++ mapAttrsToList (feat: enabled: - optionalString enabled "WITH_${toUpper feat}=YES" - ) features; - postPatch = '' - # Can't suid in nix store - # Run hikari as root (it will drop privileges as early as possible), or create - # a systemd unit to give it the necessary permissions/capabilities. - substituteInPlace Makefile --replace '4555' '555' - sed -i 's@<drm_fourcc.h>@<libdrm/drm_fourcc.h>@' src/*.c ''; diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index f76496e..c539517 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -27,25 +27,6 @@ in }) { }; - #### taken from nixpkgs PRs - - - plover = self.python3Packages.callPackage ./plover/plover.nix { - inherit (self.libsForQt5) wrapQtAppsHook; - pyqt = self.python3Packages.pyqt5; - }; - - plover-dev = self.python3Packages.callPackage ./plover/plover-dev.nix { - inherit (self.qt6) wrapQtAppsHook qtbase; - pyqt = self.python3Packages.pyside6; - }; - - plover-stroke = self.python3Packages.callPackage ./plover/plover-stroke.nix { }; - - - rtf-tokenize = self.python3Packages.callPackage ./plover/rtf_tokenize.nix { }; - - #### packages which are actually in use somewhere #### @@ -59,7 +40,7 @@ in ]; }); - akkoma = (self.callPackage ./akkoma {}).overrideAttrs { + akkoma = (super.akkoma).overrideAttrs { patches = [ ./patches/akkoma-toki-pona.patch ]; }; @@ -172,14 +153,18 @@ in }; in '' ln -sf ${TwemojiMozilla-colr} \ - res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2 + apps/web/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2 ln -sf ${TwemojiMozilla-sbix} \ - res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2 - substituteInPlace src/stores/room-list/ListLayout.ts \ - --replace "TILE_HEIGHT_PX = 44" "TILE_HEIGHT_PX = 32" + apps/web/res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2 + # substituteInPlace apps/web/src/stores/room-list/ListLayout.ts \ + # --replace "TILE_HEIGHT_PX = 44" "TILE_HEIGHT_PX = 32" ''; }; + tracktrain = self.callPackage (inputs.tracktrain {}) { + #compiler = "default"; + }; + bahnhof-name = let haskellPkgs = self.haskellPackages.override (old: { @@ -234,9 +219,9 @@ in }) {}; }; }); - pkg = { mkDerivation, base, bytestring, cassava, containers + pkg = { mkDerivation, base, bytestring, cassava, containers, dns , fuzzyfind, fuzzyset, http-client, http-client-rustls, http-types - , lib, stm, text, time, vector, wai, wai-extra, warp + , lib, network, stm, text, time, vector, wai, wai-extra, warp }: mkDerivation { pname = "bahnhof-name"; @@ -245,10 +230,11 @@ in isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring cassava containers fuzzyfind fuzzyset http-client - http-client-rustls http-types stm text time vector wai wai-extra - warp + base bytestring cassava containers dns fuzzyfind fuzzyset + http-client http-client-rustls http-types network stm text time + vector wai wai-extra warp ]; + description = "Serve information on German railway stations"; jailbreak = true; mainProgram = "bahnhof-name"; license = lib.licenses.eupl12; @@ -265,13 +251,6 @@ in #### sporadically maintained / updated #### - hikari_unstable = (unstable.hikari.overrideAttrs (old: { - src = /home/stuebinm/clones/hikari; - buildInputs = old.buildInputs ++ [ self.pandoc self.xorg.xcbutilwm.dev ]; #self.libdrm self.libdrm.dev ]; - makeFlags = with self.lib; - [ "PREFIX=$(out)" "WITH_POSIX_C_SOURCE=YES" - "WITH_GAMMACONTROL=YES" "WITH_LAYERSHELL=YES" "WITH_SCREENCOPY=YES" ]; - })).override { wlroots = unstable.wlroots_0_16; stdenv = self.clangStdenv; }; twelf = super.twelf.overrideAttrs (old: { src = self.fetchFromGitHub { owner = "k4rtik"; @@ -305,9 +284,7 @@ in }; - hikari = self.callPackage ./hikari.nix { wlroots = self.wlroots_0_15; }; - - wlroots_0_15 = self.callPackage ./wlroots_0_15.nix {}; + hikari = self.callPackage ./hikari.nix { }; travelynx = self.callPackage ./travelynx.nix {}; diff --git a/pkgs/patches/element-css.patch b/pkgs/patches/element-css.patch index 4123bab..94621ff 100644 --- a/pkgs/patches/element-css.patch +++ b/pkgs/patches/element-css.patch @@ -2,8 +2,8 @@ diff --git a/res/css/dings.custom.css b/res/css/dings.custom.css new file mode 100644 index 000000000..48ae3414f --- /dev/null -+++ b/res/css/dings.custom.css -@@ -0,0 +1,104 @@ ++++ b/apps/web/res/css/dings.custom.css +@@ -0,0 +1,120 @@ + +.mx_RoomTile .mx_RoomTile_titleContainer .mx_RoomTile_title { + font-size: 11pt !important; @@ -108,10 +108,26 @@ index 000000000..48ae3414f + --MBody-border-radius: 2px !important; +} + ++[class*="roomListItem"] { ++ min-height: 35px; ++ color: white; ++} ++[class*="selected"]>div { ++ background-color: darkred ++} ++[class*="selected"]>div::before { ++ background-color: unset ++} ++[class*="stickyRow"] [class*="container"] { ++ border-color: darkred; ++ border-bottom: 3px solid darkred; ++ border-radius: 0; ++ color: white; ++} diff --git a/src/vector/index.html b/src/vector/index.html index f5213701c..50e0729d9 100644 ---- a/src/vector/index.html -+++ b/src/vector/index.html +--- a/apps/web/src/vector/index.html ++++ b/apps/web/src/vector/index.html @@ -48,6 +48,7 @@ <link rel="stylesheet" href="<%= file %>"> <% } @@ -122,8 +138,8 @@ index f5213701c..50e0729d9 100644 let path = tag.attributes && tag.attributes.href; diff --git a/webpack.config.js b/webpack.config.js index d7dc5ffa0..00f751ed8 100644 ---- a/webpack.config.js -+++ b/webpack.config.js +--- a/apps/web/webpack.config.ts ++++ b/apps/web/webpack.config.ts @@ -365,6 +365,24 @@ module.exports = (env, argv) => { }, }, diff --git a/pkgs/plover/default.nix b/pkgs/plover/default.nix deleted file mode 100644 index 865d469..0000000 --- a/pkgs/plover/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - -} diff --git a/pkgs/plover/plover-dev.nix b/pkgs/plover/plover-dev.nix deleted file mode 100644 index c39ee14..0000000 --- a/pkgs/plover/plover-dev.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - lib, - fetchFromGitHub, - writeShellScriptBin, - plover, - python3Packages, - pkginfo, - packaging, - psutil, - pygments, - readme-renderer, - requests-cache, - requests-futures, - # Qt - pyqt, - qtbase, - wrapQtAppsHook, -}: - -(plover.override { - inherit wrapQtAppsHook pyqt; -}).overridePythonAttrs - (oldAttrs: rec { - version = "5.0.0.dev2"; - - src = fetchFromGitHub { - owner = "openstenoproject"; - repo = "plover"; - tag = "v${version}"; - hash = "sha256-PZwxVrdQPhgbj+YmWZIUETngeJGs6IQty0hY43tLQO0="; - }; - - pyproject = true; - - # pythonRelaxDeps seemingly doesn't work here - postPatch = oldAttrs.postPatch + '' - sed -i /PySide6-Essentials/d pyproject.toml - - substituteInPlace pyproject.toml \ - --replace-fail "setuptools>=79.0.0" "setuptools" - ''; - - build-system = oldAttrs.build-system ++ [ - # Replacement for missing pyside6-essentials tools, - # workaround for https://github.com/NixOS/nixpkgs/issues/277849. - # Ideally this would be solved in pyside6 itself but I spent four - # hours trying to untangle its build system before giving up. If - # anyone wants to spend the time fixing it feel free to request - # me (@Pandapip1) as a reviewer. - (writeShellScriptBin "pyside6-uic" '' - exec ${qtbase}/libexec/uic -g python "$@" - '') - (writeShellScriptBin "pyside6-rcc" '' - exec ${qtbase}/libexec/rcc -g python "$@" - '') - ]; - - dependencies = - oldAttrs.dependencies - ++ [ - packaging - pkginfo - psutil - pygments - qtbase - readme-renderer - requests-cache - requests-futures - ] - ++ readme-renderer.optional-dependencies.md; - - meta.description = oldAttrs.meta.description + " (Development version)"; - }) diff --git a/pkgs/plover/plover-stroke.nix b/pkgs/plover/plover-stroke.nix deleted file mode 100644 index 62da352..0000000 --- a/pkgs/plover/plover-stroke.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - pytestCheckHook, - pytest-qt, - pyside6, -}: - -buildPythonPackage rec { - pname = "plover-stroke"; - version = "1.1.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "openstenoproject"; - repo = "plover_stroke"; - tag = version; - hash = "sha256-A75OMzmEn0VmDAvmQCp6/7uptxzwWJTwsih3kWlYioA="; - }; - - build-system = [ setuptools ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-qt - pyside6 - ]; - - pythonImportsCheck = [ "plover_stroke" ]; - - meta = { - description = "Helper class for working with steno strokes"; - homepage = "https://github.com/openstenoproject/plover_stroke"; - license = lib.licenses.gpl2Plus; # https://github.com/openstenoproject/plover_stroke/issues/4 - maintainers = with lib.maintainers; [ pandapip1 ]; - }; -} diff --git a/pkgs/plover/plover.nix b/pkgs/plover/plover.nix deleted file mode 100644 index 17c106c..0000000 --- a/pkgs/plover/plover.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ - lib, - config, - stdenv, - plover, - buildPythonPackage, - fetchFromGitHub, - fetchpatch, - versionCheckHook, - appdirs, - babel, - evdev, - mock, - pyserial, - pytestCheckHook, - pytest-qt, - plover-stroke, - rtf-tokenize, - setuptools, - wcwidth, - wheel, - xlib, - # Qt dependencies - pyqt, - wrapQtAppsHook, -}: - -buildPythonPackage rec { - pname = "plover"; - version = "4.0.2"; - pyproject = true; - - src = fetchFromGitHub { - owner = "openstenoproject"; - repo = "plover"; - tag = "v${version}"; - hash = "sha256-VpQT25bl8yPG4J9IwLkhSkBt31Y8BgPJdwa88WlreA8="; - }; - - postPatch = '' - sed -i 's/,<77//g' pyproject.toml # pythonRelaxDepsHook doesn't work for this for some reason - ''; - - build-system = [ - babel - setuptools - pyqt - wheel - ]; - dependencies = [ - appdirs - evdev - pyqt - pyserial - plover-stroke - rtf-tokenize - setuptools - wcwidth - xlib - ]; - nativeBuildInputs = [ - wrapQtAppsHook - ]; - - nativeCheckInputs = [ - pytestCheckHook - versionCheckHook - pytest-qt - mock - ]; - - # Segfaults?! - disabledTestPaths = [ "test/gui_qt/test_dictionaries_widget.py" ]; - - preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") - ''; - - dontWrapQtApps = true; - - pythonImportsCheck = [ "plover" ]; - - meta = { - description = "OpenSteno Plover stenography software"; - homepage = "https://www.openstenoproject.org/plover/"; - mainProgram = "plover"; - maintainers = with lib.maintainers; [ - twey - kovirobi - pandapip1 - ]; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; - }; -} diff --git a/pkgs/plover/rtf_tokenize.nix b/pkgs/plover/rtf_tokenize.nix deleted file mode 100644 index 805845f..0000000 --- a/pkgs/plover/rtf_tokenize.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "rtf-tokenize"; - version = "1.0.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "openstenoproject"; - repo = "rtf_tokenize"; - tag = version; - hash = "sha256-zwD2sRYTY1Kmm/Ag2hps9VRdUyQoi4zKtDPR+F52t9A="; - }; - - build-system = [ setuptools ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "rtf_tokenize" ]; - - meta = { - description = "Simple RTF tokenizer package for Python"; - homepage = "https://github.com/openstenoproject/rtf_tokenize"; - license = lib.licenses.gpl2Plus; # https://github.com/openstenoproject/rtf_tokenize/issues/1 - maintainers = with lib.maintainers; [ pandapip1 ]; - }; -} |