summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--home/packages.nix2
-rw-r--r--npins/sources.json54
-rw-r--r--pkgs/overlay.nix19
-rw-r--r--pkgs/plover/default.nix5
-rw-r--r--pkgs/plover/plover-dev.nix73
-rw-r--r--pkgs/plover/plover-stroke.nix39
-rw-r--r--pkgs/plover/plover.nix96
-rw-r--r--pkgs/plover/rtf_tokenize.nix33
8 files changed, 28 insertions, 293 deletions
diff --git a/home/packages.nix b/home/packages.nix
index 236b5b6..e9e6090 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -9,7 +9,7 @@ in
emacs-all-the-icons-fonts julia-mono
river-classic swaybg swaylock
- plover-dev
+ plover
# internet apps & clients
firefox keepassxc mumble lynx offpunk
openconnect telegram-desktop monolith magic-wormhole-rs
diff --git a/npins/sources.json b/npins/sources.json
index f97ecd8..46e2f0d 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -9,9 +9,9 @@
},
"branch": "main",
"submodules": false,
- "revision": "851ce068cf8ed9b1df8005ef76148143b9b8e74d",
- "url": "https://github.com/ai-robots-txt/ai.robots.txt/archive/851ce068cf8ed9b1df8005ef76148143b9b8e74d.tar.gz",
- "hash": "1ba7dq1q7bs4nqdar4qwd43d7s00777nvdmmclmqmk3zpwhvk0ib"
+ "revision": "f420408eee6c6a8c4eaf3536d6f9c926c9b01fa4",
+ "url": "https://github.com/ai-robots-txt/ai.robots.txt/archive/f420408eee6c6a8c4eaf3536d6f9c926c9b01fa4.tar.gz",
+ "hash": "0b9sv1y3bkpy29fh35kam7zirvx2kdwf8yngfn1zx7qwm6ylxr0a"
},
"almanac": {
"type": "Git",
@@ -114,9 +114,9 @@
},
"branch": "release-25.11",
"submodules": false,
- "revision": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5",
- "url": "https://github.com/nix-community/home-manager/archive/cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5.tar.gz",
- "hash": "1zvr96smn9xs56020424pfz91cxwlm8sv17rrav8qdhq670jm7qs"
+ "revision": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
+ "url": "https://github.com/nix-community/home-manager/archive/3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f.tar.gz",
+ "hash": "13fmry1jd0na71fxhzms9qf3ybj6shgvnphq4p1akxxmv44gzq20"
},
"isabelle-utils": {
"type": "Git",
@@ -138,9 +138,9 @@
},
"branch": "main",
"submodules": false,
- "revision": "8ab7547a742618da5cbfd5ad3632a6abfdbe4191",
+ "revision": "daa2bc82bc0ddc17fd2b72781f1c740a5a7b264c",
"url": null,
- "hash": "1cf8kii5zp43p2zdrljwxjn25872y2wi6smkki3wc5f81a3pzqv9"
+ "hash": "0agd9vizn0lqvpz2fzdricry8kbbg2zw6aj2hyg80ibg732bcw2j"
},
"lix-nixos-module": {
"type": "Git",
@@ -150,9 +150,9 @@
},
"branch": "main",
"submodules": false,
- "revision": "5e56f5a973e24292b125dca9e9d506b0a91d6903",
+ "revision": "727d859b6f5f3289ce49fe26146b3f006387d457",
"url": null,
- "hash": "1ckmm82bdhbmy146v2kcmg92179k5n8flhy49dbvpxgwyzfh5nfb"
+ "hash": "0zzhvi2zy5764pwck1rjwdbrzpgs8k64jvd8j1632ngdvpkmyir2"
},
"mirage-opam-overlays": {
"type": "Git",
@@ -189,9 +189,9 @@
},
"branch": "nixos-25.11",
"submodules": false,
- "revision": "26ef669cffa904b6f6832ab57b77892a37c1a671",
- "url": "https://github.com/NixOS/nixpkgs/archive/26ef669cffa904b6f6832ab57b77892a37c1a671.tar.gz",
- "hash": "06rhb49ksbc07lp31xgf8qdlph29knrql30x58s4x3fflcw8zkg5"
+ "revision": "535f3e6942cb1cead3929c604320d3db54b542b9",
+ "url": "https://github.com/NixOS/nixpkgs/archive/535f3e6942cb1cead3929c604320d3db54b542b9.tar.gz",
+ "hash": "0f9137a4dggpm5p6ikzh5zvigjnlyfwpi3ssskhx5rwsii7nbzys"
},
"nixpkgs-unstable": {
"type": "Git",
@@ -202,9 +202,9 @@
},
"branch": "nixpkgs-unstable",
"submodules": false,
- "revision": "73c703c22422b8951895a960959dbbaca7296492",
- "url": "https://github.com/NixOS/nixpkgs/archive/73c703c22422b8951895a960959dbbaca7296492.tar.gz",
- "hash": "16zm385d479f1wdi3yrb38mg4wiylfw8khg6vld55rb9jqvy43y1"
+ "revision": "cbb5cf358f50aa6acc9efd6113b7bcfbc352cd73",
+ "url": "https://github.com/NixOS/nixpkgs/archive/cbb5cf358f50aa6acc9efd6113b7bcfbc352cd73.tar.gz",
+ "hash": "005lz0rdsj188j63zyim4pkxadqcq276x7w9727ymb2av7awczi1"
},
"ntfy-matrix-bot": {
"type": "Git",
@@ -255,9 +255,9 @@
},
"branch": "master",
"submodules": false,
- "revision": "12731a6f86d7c452a94c72106fa9d3327988582d",
- "url": "https://github.com/dune-universe/opam-overlays/archive/12731a6f86d7c452a94c72106fa9d3327988582d.tar.gz",
- "hash": "0zhgcn5j5aygxqkzsfdsfafw17pr9f2fcs7175kiwyrfj2wzsdmn"
+ "revision": "efd742d67b0d49b2d6f491ffbbf205ca42977a6e",
+ "url": "https://github.com/dune-universe/opam-overlays/archive/efd742d67b0d49b2d6f491ffbbf205ca42977a6e.tar.gz",
+ "hash": "1f41bfr187kv8r3my41a56czlpj34b3yxl1wlbg4m37yhxns4yyd"
},
"opam-repository": {
"type": "GitRelease",
@@ -312,9 +312,9 @@
},
"branch": "master",
"submodules": false,
- "revision": "669151bbc7f2416b622af2f48e9136e2c9da5530",
- "url": "https://github.com/oxalica/rust-overlay/archive/669151bbc7f2416b622af2f48e9136e2c9da5530.tar.gz",
- "hash": "0khzlgsjsqq046x548jqbhziyfhp4g6qrzfkz627nsw172g2akm0"
+ "revision": "7d5f8d75fc195a236b46633d7679139698aeb35f",
+ "url": "https://github.com/oxalica/rust-overlay/archive/7d5f8d75fc195a236b46633d7679139698aeb35f.tar.gz",
+ "hash": "02m17jzmpym1gh7rj94pf4fsb4ma90sdjz334xd464145cb0yi1i"
},
"showrt": {
"type": "Git",
@@ -337,9 +337,9 @@
},
"branch": "master",
"submodules": false,
- "revision": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5",
- "url": "https://github.com/Mic92/sops-nix/archive/8eaee5c45428b28b8c47a83e4c09dccec5f279b5.tar.gz",
- "hash": "1ha37kyn11dj5k38nbasybp4fnmm6iy1lbzvxfydlk4f55j9kkvd"
+ "revision": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
+ "url": "https://github.com/Mic92/sops-nix/archive/9ed65852b6257fbeae4355bc24ecfea307ca759a.tar.gz",
+ "hash": "0jm1xzqp508avayvnx2q7qiw7wj1kqz6m2g1vr0i1vj03qvhmbqs"
},
"tracktrain": {
"type": "Git",
@@ -349,9 +349,9 @@
},
"branch": "main",
"submodules": false,
- "revision": "5fa550010cd0d9293d253d9528a4029db26ced54",
+ "revision": "dbb5c4b6b882cd99981eb854386586854a23fdec",
"url": null,
- "hash": "1l4zb1d56zzgk4j3w1i0ylxwsjnzshv98kjdksk50j7cm7p1vyby"
+ "hash": "1ridckbs4pwj9na3nq6dmvqjgyfr40cp05p4f9cxv8way8frkdik"
},
"traveltext": {
"type": "Git",
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index bbbf3fb..d7b5769 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 ####
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 ];
- };
-}
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-09 20:16:27 +0000