diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/hikari.nix | 3 | ||||
| -rw-r--r-- | pkgs/mollysocket.nix | 2 | ||||
| -rw-r--r-- | pkgs/nomsring/nomsring.cabal | 2 | ||||
| -rw-r--r-- | pkgs/overlay.nix | 16 | ||||
| -rw-r--r-- | pkgs/patches/akkoma-fe-toki-pona-2.patch | 13 | ||||
| -rw-r--r-- | pkgs/patches/akkoma-fe-toki-pona.patch | 14 | ||||
| -rw-r--r-- | pkgs/wlroots_0_15.nix | 9 |
7 files changed, 36 insertions, 23 deletions
diff --git a/pkgs/hikari.nix b/pkgs/hikari.nix index 6506590..afbc335 100644 --- a/pkgs/hikari.nix +++ b/pkgs/hikari.nix @@ -2,6 +2,7 @@ , pkg-config, bmake , cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman , libucl, wayland, wayland-protocols, wayland-scanner, wlroots, mesa +, libdrm, libgbm , features ? { gammacontrol = true; layershell = true; @@ -27,6 +28,8 @@ stdenv.mkDerivation rec { libevdev libinput libxkbcommon + libdrm + libgbm linux-pam pango pixman diff --git a/pkgs/mollysocket.nix b/pkgs/mollysocket.nix index 1a079b4..a58c1a0 100644 --- a/pkgs/mollysocket.nix +++ b/pkgs/mollysocket.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2OWkPTbrD4oXHoB+qszVjLr0e/AUuNnuaYXZ3kOyuxg="; }; - cargoHash = "sha256-fVH5gzQYzW6uIBO8Fob04IiVyxHDh+Pr21rSow40qLk="; + cargoHash = "sha256-fR87PUgb+F2Q4vRYUonmGi6JzJLvGWPEKhwHw+TAsyQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/nomsring/nomsring.cabal b/pkgs/nomsring/nomsring.cabal index fca40c5..ea3625f 100644 --- a/pkgs/nomsring/nomsring.cabal +++ b/pkgs/nomsring/nomsring.cabal @@ -13,7 +13,7 @@ common warnings executable nomsring import: warnings main-is: Main.hs - build-depends: base ^>=4.18 + build-depends: base , cgi ^>=3001.5 , data-clist ^>= 0.2 default-language: GHC2021 diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index 2d561ff..e981f8f 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -12,7 +12,7 @@ let radicle = import ./radicle.nix; in { - beam = super.beam_nox; + beam = super.beam_minimal; git-annex-remote-remarkable2 = self.callPackage ({ rustPlatform, fetchgit, ... }: @@ -31,8 +31,11 @@ in galmon-core = self.callPackage ./galmon.nix {}; galmon-full = self.callPackage ./galmon.nix { buildAll = true; }; - akkoma-fe = super.akkoma-frontends.akkoma-fe.overrideAttrs (old: { - patches = [ ./patches/akkoma-fe-toki-pona.patch ]; + akkoma-fe = super.akkoma-fe.overrideAttrs (old: { + patches = [ + ./patches/akkoma-fe-toki-pona.patch + ./patches/akkoma-fe-toki-pona-2.patch + ]; }); akkoma = (self.callPackage ./akkoma {}).overrideAttrs { @@ -202,7 +205,7 @@ in , lib, stm, text, time, vector, wai, wai-extra, warp }: mkDerivation { - pname = "bahnhof.name"; + pname = "bahnhof-name"; version = "0.2.0.0"; src = inputs.bahnhof-name; isLibrary = false; @@ -212,6 +215,7 @@ in http-client-openssl http-types stm text time vector wai wai-extra warp ]; + jailbreak = true; mainProgram = "bahnhof-name"; license = lib.licenses.eupl12; postInstall = '' @@ -245,13 +249,13 @@ in git-who = self.buildGoModule rec { pname = "git-who"; - version = "0.7"; + version = "1.1"; src = (self.fetchFromGitHub { owner = "sinclairtarget"; repo = "git-who"; rev = "v${version}"; - hash = "sha256-Ujtwb4DTK7dUcyHvaF52a/YF3YO6WyszUIoxrEKE9jo="; + hash = "sha256-H6RbmkM8/n0HDMI3auz6YyEn/vsfXWk5ig+pBhZG3nI="; # submodules contain test data and have ssh urls, hence this absurdity fetchSubmodules = true; leaveDotGit = true; diff --git a/pkgs/patches/akkoma-fe-toki-pona-2.patch b/pkgs/patches/akkoma-fe-toki-pona-2.patch new file mode 100644 index 0000000..3dc549b --- /dev/null +++ b/pkgs/patches/akkoma-fe-toki-pona-2.patch @@ -0,0 +1,13 @@ +diff --git a/src/lib/post_language.js b/src/lib/post_language.js +index 7dcaebce..4d146773 100644 +--- a/src/lib/post_language.js ++++ b/src/lib/post_language.js +@@ -3,7 +3,7 @@ import { computed } from 'vue' + + export const usePostLanguageOptions = () => { + const postLanguageOptions = computed(() => { +- return iso6391.getAllCodes().map(lang => ({ ++ return iso6391.getAllCodes().concat(['tok']).map(lang => ({ + key: lang, + value: lang, + label: lang, diff --git a/pkgs/patches/akkoma-fe-toki-pona.patch b/pkgs/patches/akkoma-fe-toki-pona.patch index 281fdfc..b556fb6 100644 --- a/pkgs/patches/akkoma-fe-toki-pona.patch +++ b/pkgs/patches/akkoma-fe-toki-pona.patch @@ -4,23 +4,9 @@ Date: Fri, 23 Jun 2023 01:56:43 +0200 Subject: [PATCH] mi la, toki pona li pona a --- - src/components/post_status_form/post_status_form.js | 2 +- src/services/locale/locale.service.js | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) -diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js -index 5647a9eb..25180ba9 100644 ---- a/src/components/post_status_form/post_status_form.js -+++ b/src/components/post_status_form/post_status_form.js -@@ -303,7 +303,7 @@ const PostStatusForm = { - mobileLayout: state => state.interface.mobileLayout - }), - isoLanguages () { -- return iso6391.getAllCodes(); -+ return iso6391.getAllCodes().concat(['tok']); - } - }, - watch: { diff --git a/src/services/locale/locale.service.js b/src/services/locale/locale.service.js index 8cef2522..8bee6ad2 100644 --- a/src/services/locale/locale.service.js diff --git a/pkgs/wlroots_0_15.nix b/pkgs/wlroots_0_15.nix index 93095f8..6b63e4c 100644 --- a/pkgs/wlroots_0_15.nix +++ b/pkgs/wlroots_0_15.nix @@ -23,6 +23,9 @@ , glslang , libliftoff , libdisplay-info +, libdrm +, libgbm +, cmake , nixosTests , enableXWayland ? true @@ -47,6 +50,8 @@ stdenv.mkDerivation { hash = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM="; }; + CFLAGS = [ "-Wno-calloc-transposed-args" ]; + postPatch = '' substituteInPlace backend/drm/meson.build \ --replace /usr/share/hwdata/ ${hwdata}/share/hwdata/ @@ -58,10 +63,12 @@ stdenv.mkDerivation { strictDeps = true; depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner glslang ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner glslang cmake ]; buildInputs = [ libGL + libdrm + libgbm libcap libinput libpng |