Merge pull request 'update' (#286) from update-flake into main

Reviewed-on: #286

ci/woodpecker/source.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/woodpecker-ci/woodpecker",
-  "rev": "cef135eba5f21a3e4ad429f9af51f535ce907372",
-  "date": "2023-07-07T20:02:13+02:00",
-  "path": "/nix/store/8lab0szy89p5n04glnsyc8pci3ywyj8q-woodpecker",
-  "sha256": "1cbdy1lwnl714pg2zqy28a5646pkhch68gwp62rrmnqwf4fnkfh7",
+  "rev": "de13aeea339bd72d8417b2aea5b51dd1dc540632",
+  "date": "2023-07-09T12:32:19+02:00",
+  "path": "/nix/store/0z634x378psg6pmz1dp9hwk6sa8y7r1a-woodpecker",
+  "sha256": "129bm9v7aymif6arwlpav14wiiyybd283wychkjr9vhl0x7iys65",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

ci/woodpecker/yarn.lock

@@ -1081,9 +1081,9 @@ callsites@^3.0.0:
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
 caniuse-lite@^1.0.30001503:
-  version "1.0.30001513"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001513.tgz#382fe5fbfb0f7abbaf8c55ca3ac71a0307a752e9"
-  integrity sha512-pnjGJo7SOOjAGytZZ203Em95MRM8Cr6jhCXNF/FAXTpCTRTECnqQWLpiTRqrFtdYcth8hf4WECUpkezuYsMVww==
+  version "1.0.30001514"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001514.tgz#e2a7e184a23affc9367b7c8d734e7ec4628c1309"
+  integrity sha512-ENcIpYBmwAAOm/V2cXgM7rZUrKKaqisZl4ZAI520FIkqGXUxJjmaIssbRW5HVVR5tyV6ygTLIm15aU8LUmQSaQ==
 
 chalk@^2.0.0:
   version "2.4.2"

default.nix

@@ -74,6 +74,7 @@ in
       kubo
       fcitx5
       plover-plugin-python-dictionary
+      plover-plugin-stenotype-extended
       ;
   }
   // (

flake.lock

@@ -259,11 +259,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1688800490,
-        "narHash": "sha256-gsCh6ermMwQEPxi0AC7YS+rZ/v4xLTafPRFGAon903s=",
+        "lastModified": 1688915868,
+        "narHash": "sha256-ZEraE8M5HhnYVEnKztgs7Sg3EMJp7WWVvg9cOCsLHJo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c138b605600fa00307dc3f090b9d21ee771892f0",
+        "rev": "6510fd1c3d847b6dfd2c96cfcf762a4844786b68",
         "type": "github"
       },
       "original": {

flake.nix

@@ -118,6 +118,7 @@
               hydra-unstable
               fcitx5
               plover-plugin-python-dictionary
+              plover-plugin-stenotype-extended
               ;
           }
           // (

matrix/mautrix-whatsapp/gomod2nix.toml

@@ -122,5 +122,5 @@ schema = 3
     version = "v2.4.1"
     hash = "sha256-OstOCC7Bib6mbcUG2X3YafEBikFhPQ8lN6jPK5c/Ah8="
   [mod."maunium.net/go/mautrix"]
-    version = "v0.15.4-0.20230628151140-e99578a15474"
-    hash = "sha256-x6H/lGYr5y9uzZ0g7n0ssyp8W+Gt33mGl5kaw6cgXhE="
+    version = "v0.15.4-0.20230707135424-4639f0c9c471"
+    hash = "sha256-4qU6V/5MPmlpRQMw+m1tH9OAD4AfGVJyweJ9gBomdP8="

matrix/mautrix-whatsapp/source.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/mautrix/whatsapp",
-  "rev": "c00fa4dd246b4123b37144cfe33ecf6f4735c010",
-  "date": "2023-07-05T12:09:34+03:00",
-  "path": "/nix/store/wrm9az3aqm0lhg1kb68c7v2b8xpkvhdr-whatsapp",
-  "sha256": "0b2wycjipl9q5nwmqxkjnv3zb4nnzqsfkjiskfyc4sx85ha5x80x",
+  "rev": "ff609124b25717a23cd1f4d01de86a7ea59c6c5e",
+  "date": "2023-07-08T13:14:22+03:00",
+  "path": "/nix/store/fk19yrkgdffvkj4dnbvswn3cjngf1gbc-whatsapp",
+  "sha256": "1jhnjj17dwkac1g13bq0k37nhv2k2blv3my53l7znpd3r4a3r4c7",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

minecraft/papermc/paper.json

@@ -1,6 +1,6 @@
 {
   "version": "1.20.1",
-  "build": 67,
-  "name": "paper-1.20.1-67.jar",
-  "sha256": "9184c6bd1fb5a54d3f13d589e871954fe5a66b2196394bd4bf72e048f1b31f71"
+  "build": 68,
+  "name": "paper-1.20.1-68.jar",
+  "sha256": "1ef8b2332ecd18f50888918a69e44c77a536c7e5b027f59fd75e93cac9fa64cf"
 }

overlay.nix

@@ -95,6 +95,7 @@ system: self: super: let
       plover-plugin-tapey-tape = self.python3Packages.callPackage ./plover/plover-tapey-tape.nix {};
       plover-plugin-yaml-dictionary = self.python3Packages.callPackage ./plover/plover-yaml-dictionary.nix {};
       plover-plugin-python-dictionary = self.python3Packages.callPackage ./plover/plover-python-dictionary.nix {};
+      plover-plugin-stenotype-extended = self.python3Packages.callPackage ./plover/plover-stenotype-extended.nix {};
       plover-plugin-machine-hid = self.python3Packages.callPackage ./plover/plover-machine-hid.nix {};
       plover-plugin-rkb1-hid = self.python3Packages.callPackage ./plover/plover-rkb1-hid.nix {};
       plover-dict-didoesdigital = self.callPackage ./plover/didoesdigital-dictionary.nix {};

plover/plover-stenotype-extended.nix

@@ -0,0 +1,28 @@
+{
+  callPackage,
+  buildPythonPackage,
+  fetchPypi,
+  lib,
+  pythonOlder,
+}: let
+  plover = callPackage ./plover {};
+in
+  buildPythonPackage rec {
+    pname = "plover-stenotype-extended";
+    version = "1.0.0";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "sha256-IC9eGs5tMvA13h9STQtp5kfSVvSe2lIWzbPZCqoBZbU=";
+    };
+
+    doCheck = false;
+
+    disabled = pythonOlder "3.6";
+    propagatedBuildInputs = [plover];
+
+    meta = with lib; {
+      description = "Plover plugin for an extended Stenotype layout.";
+      license = licenses.gpl3Plus;
+    };
+    passthru.updateScript = [../scripts/update-python-libraries "plover/plover-stenotype-extended.nix"];
+  }