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

Reviewed-on: #257

art/lotte/source.json

@@ -1,9 +1,9 @@
 {
   "url": "https://git.chir.rs/darkkirb/lotte-art",
-  "rev": "37730ffb532d412ac7a0294351e91c1816f88c4f",
+  "rev": "7f83e0ac5d88bb1db6596b4a44220d21e42015c8",
-  "date": "2023-04-16T20:44:44+01:00",
+  "date": "2023-06-03T09:00:35+01:00",
-  "path": "/nix/store/gbpddcp836j5qrhxzp85a5prrbw347vn-lotte-art",
+  "path": "/nix/store/cs4hlb6svkfmxc6hbhf2rz6bhr1pmsv9-lotte-art",
-  "sha256": "15i4x90nf81p7zyajhvyvahylv8amrf4d5sgs6qvy0q71b7dnfqy",
+  "sha256": "1ffz1agshp7gxpxyabdjlyffrmdi1p5bafi0vm9np1js6ml7yq11",
   "fetchLFS": true,
   "fetchSubmodules": false,
   "deepClone": false,

ci/woodpecker/gomod2nix.toml

@@ -50,14 +50,14 @@ schema = 3
     version = "v1.0.2"
     hash = "sha256-gfwm6i0ZGQhX2c0lDRe7qVXyHkhoHeemYpaj+O0aYyw="
   [mod."github.com/docker/cli"]
-    version = "v23.0.6+incompatible"
+    version = "v20.10.24+incompatible"
-    hash = "sha256-BEiQMN6PC+BTG5npabyE9vM1q5r3Oep+Nz0N4ytM5Uw="
+    hash = "sha256-5bvtx8SXoCnSN/M/Eb8TE0ctW8o0jH7mB2zF1JRx3Eg="
   [mod."github.com/docker/distribution"]
     version = "v2.8.2+incompatible"
     hash = "sha256-ocVWMRt5ErWdVsj3rsNa/QhizG5b/PCu8LoOlUi24/c="
   [mod."github.com/docker/docker"]
-    version = "v23.0.6+incompatible"
+    version = "v20.10.24+incompatible"
-    hash = "sha256-TP6UJgSp8gCthRnwX2GAW/s+4S9GfBwggWI0/mE4wk8="
+    hash = "sha256-jYtP4+fnWPPjC+3vQd+v9B41GkT63+W5C5CAA9uPfa0="
   [mod."github.com/docker/docker-credential-helpers"]
     version = "v0.7.0"
     hash = "sha256-Np+esoutU1psMWB0G1ayKwaWVn/XemIXxlVlooXphzg="
@@ -221,8 +221,8 @@ schema = 3
     version = "v1.1.50"
     hash = "sha256-mtf3QAk46pCA0a1K+oH6a7oqsY6LR6Qr8HD4qnDqe+s="
   [mod."github.com/moby/moby"]
-    version = "v23.0.6+incompatible"
+    version = "v20.10.24+incompatible"
-    hash = "sha256-TP6UJgSp8gCthRnwX2GAW/s+4S9GfBwggWI0/mE4wk8="
+    hash = "sha256-jYtP4+fnWPPjC+3vQd+v9B41GkT63+W5C5CAA9uPfa0="
   [mod."github.com/moby/term"]
     version = "v0.5.0"
     hash = "sha256-jy0kbkeUsr0KoiE33WLxNAgYXZIERKR2O5+saXBwdD8="

ci/woodpecker/source.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/woodpecker-ci/woodpecker",
-  "rev": "71d7a467f904eb83432227450693f1b66b6075dd",
+  "rev": "6e6f36ee3a58672736ecc2d36d70de7bc0f52800",
-  "date": "2023-06-01T14:58:12+00:00",
+  "date": "2023-06-03T09:21:51+02:00",
-  "path": "/nix/store/qzsnp5cl0g1bsmybhmx28icp2ik8alll-woodpecker",
+  "path": "/nix/store/byhljmlcyrd0k5s5wppigm8vfjnslllg-woodpecker",
-  "sha256": "0v8msn6m7lvb65641zsmn6r76k663kjd6vxqnzk3pxkad4y7hhl2",
+  "sha256": "1iv5qjp4dhm2dh52y400wzmlxv4c34yzr12jzp4javzkk90rvgxw",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

ci/woodpecker/yarn.lock

@@ -341,10 +341,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.41.0":
+"@eslint/js@8.42.0":
-  version "8.41.0"
+  version "8.42.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.41.0.tgz#080321c3b68253522f7646b55b577dd99d2950b3"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.42.0.tgz#484a1d638de2911e6f5a30c12f49c7e4a3270fb6"
-  integrity sha512-LxcyMGxwmTh2lY9FwHPGWOHmYFCZvbrFCBZL4FzSSsxsRPuhrYUg/49/0KDfW8tnIEaEHtfmn6+NPN+1DqaNmA==
+  integrity sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw==
 
 "@floating-ui/core@^0.3.0":
   version "0.3.1"
@@ -358,7 +358,7 @@
   dependencies:
     "@floating-ui/core" "^0.3.0"
 
-"@humanwhocodes/config-array@^0.11.8":
+"@humanwhocodes/config-array@^0.11.10":
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2"
   integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==
@@ -378,12 +378,12 @@
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
 "@iconify/json@^2.2.43":
-  version "2.2.72"
+  version "2.2.73"
-  resolved "https://registry.yarnpkg.com/@iconify/json/-/json-2.2.72.tgz#dd36f450ed63784a8520b4c548d76ecaff0ad0b8"
+  resolved "https://registry.yarnpkg.com/@iconify/json/-/json-2.2.73.tgz#7edd533f7dd698809d2ca362c0124202652d6b44"
-  integrity sha512-1837vBdmUMdr2yj7AEq3dnvBCWAYguIFlEKTaur4It42oPa3bfshEKIo3Rgubf7vh3VzuU4D+NZtFTyeJjPcjQ==
+  integrity sha512-uwJLVMg811RERYPNYH1OABBZTPnGCk3Kp+sJnZrbXl3urqWCF+ssZM8ER5R/QUr/M/UqCGPFcbn5EpIhFXgRUw==
   dependencies:
     "@iconify/types" "*"
-    pathe "^1.0.0"
+    pathe "^1.1.0"
 
 "@iconify/types@*", "@iconify/types@^2.0.0":
   version "2.0.0"
@@ -1220,9 +1220,9 @@ csstype@^3.1.1:
   integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
 
 dayjs@^1.11.7:
-  version "1.11.7"
+  version "1.11.8"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.8.tgz#4282f139c8c19dd6d0c7bd571e30c2d0ba7698ea"
-  integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==
+  integrity sha512-LcgxzFoWMEPO7ggRv1Y2N31hUf2R0Vj7fuy/m+Bg1K8rr+KAs1AEy4y9jd5DXe8pbHgX+srkHNS7TH6Q6ZhYeQ==
 
 de-indent@^1.0.2:
   version "1.0.2"
@@ -1313,9 +1313,9 @@ domutils@^3.0.1:
     domhandler "^5.0.3"
 
 electron-to-chromium@^1.4.411:
-  version "1.4.417"
+  version "1.4.419"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.417.tgz#a0c7eb992e68287fa50c8da5a5238b01f20b9a82"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.419.tgz#6fbea1f3abb65bf46e8ad874b5c1f0816ce2f8ce"
-  integrity sha512-8rY8HdCxuSVY8wku3i/eDac4g1b4cSbruzocenrqBlzqruAZYHjQCHIjC66dLR9DXhEHTojsC4EjhZ8KmzwXqA==
+  integrity sha512-jdie3RiEgygvDTyS2sgjq71B36q2cDSBfPlwzUyuOrfYTNoYWyBxxjGJV/HAu3A2hB0Y+HesvCVkVAFoCKwCSw==
 
 entities@^4.2.0:
   version "4.5.0"
@@ -1590,15 +1590,15 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
   integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
 
 eslint@^8.37.0:
-  version "8.41.0"
+  version "8.42.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.41.0.tgz#3062ca73363b4714b16dbc1e60f035e6134b6f1c"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.42.0.tgz#7bebdc3a55f9ed7167251fe7259f75219cade291"
-  integrity sha512-WQDQpzGBOP5IrXPo4Hc0814r4/v2rrIsB0rhT7jtunIalgg6gYXWhRMOejVO8yH21T/FGaxjmFjBMNqcIlmH1Q==
+  integrity sha512-ulg9Ms6E1WPf67PHaEY4/6E2tEn5/f7FXGzr3t9cBMugOmf1INYvuUwwh1aXQN4MfJ6a5K2iNwP3w4AColvI9A==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.4.0"
     "@eslint/eslintrc" "^2.0.3"
-    "@eslint/js" "8.41.0"
+    "@eslint/js" "8.42.0"
-    "@humanwhocodes/config-array" "^0.11.8"
+    "@humanwhocodes/config-array" "^0.11.10"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
     ajv "^6.10.0"
@@ -2546,7 +2546,7 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-pathe@^1.0.0:
+pathe@^1.0.0, pathe@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.1.tgz#1dd31d382b974ba69809adc9a7a347e65d84829a"
   integrity sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==

ci/woodpecker/yarn.nix

@@ -400,11 +400,11 @@
       };
     }
     {
-      name = "_eslint_js___js_8.41.0.tgz";
+      name = "_eslint_js___js_8.42.0.tgz";
       path = fetchurl {
-        name = "_eslint_js___js_8.41.0.tgz";
+        name = "_eslint_js___js_8.42.0.tgz";
-        url = "https://registry.yarnpkg.com/@eslint/js/-/js-8.41.0.tgz";
+        url = "https://registry.yarnpkg.com/@eslint/js/-/js-8.42.0.tgz";
-        sha512 = "LxcyMGxwmTh2lY9FwHPGWOHmYFCZvbrFCBZL4FzSSsxsRPuhrYUg/49/0KDfW8tnIEaEHtfmn6+NPN+1DqaNmA==";
+        sha512 = "6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw==";
       };
     }
     {
@@ -448,11 +448,11 @@
       };
     }
     {
-      name = "_iconify_json___json_2.2.72.tgz";
+      name = "_iconify_json___json_2.2.73.tgz";
       path = fetchurl {
-        name = "_iconify_json___json_2.2.72.tgz";
+        name = "_iconify_json___json_2.2.73.tgz";
-        url = "https://registry.yarnpkg.com/@iconify/json/-/json-2.2.72.tgz";
+        url = "https://registry.yarnpkg.com/@iconify/json/-/json-2.2.73.tgz";
-        sha512 = "1837vBdmUMdr2yj7AEq3dnvBCWAYguIFlEKTaur4It42oPa3bfshEKIo3Rgubf7vh3VzuU4D+NZtFTyeJjPcjQ==";
+        sha512 = "uwJLVMg811RERYPNYH1OABBZTPnGCk3Kp+sJnZrbXl3urqWCF+ssZM8ER5R/QUr/M/UqCGPFcbn5EpIhFXgRUw==";
       };
     }
     {
@@ -1352,11 +1352,11 @@
       };
     }
     {
-      name = "dayjs___dayjs_1.11.7.tgz";
+      name = "dayjs___dayjs_1.11.8.tgz";
       path = fetchurl {
-        name = "dayjs___dayjs_1.11.7.tgz";
+        name = "dayjs___dayjs_1.11.8.tgz";
-        url = "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz";
+        url = "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.8.tgz";
-        sha512 = "+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==";
+        sha512 = "LcgxzFoWMEPO7ggRv1Y2N31hUf2R0Vj7fuy/m+Bg1K8rr+KAs1AEy4y9jd5DXe8pbHgX+srkHNS7TH6Q6ZhYeQ==";
       };
     }
     {
@@ -1464,11 +1464,11 @@
       };
     }
     {
-      name = "electron_to_chromium___electron_to_chromium_1.4.417.tgz";
+      name = "electron_to_chromium___electron_to_chromium_1.4.419.tgz";
       path = fetchurl {
-        name = "electron_to_chromium___electron_to_chromium_1.4.417.tgz";
+        name = "electron_to_chromium___electron_to_chromium_1.4.419.tgz";
-        url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.417.tgz";
+        url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.419.tgz";
-        sha512 = "8rY8HdCxuSVY8wku3i/eDac4g1b4cSbruzocenrqBlzqruAZYHjQCHIjC66dLR9DXhEHTojsC4EjhZ8KmzwXqA==";
+        sha512 = "jdie3RiEgygvDTyS2sgjq71B36q2cDSBfPlwzUyuOrfYTNoYWyBxxjGJV/HAu3A2hB0Y+HesvCVkVAFoCKwCSw==";
       };
     }
     {
@@ -1696,11 +1696,11 @@
       };
     }
     {
-      name = "eslint___eslint_8.41.0.tgz";
+      name = "eslint___eslint_8.42.0.tgz";
       path = fetchurl {
-        name = "eslint___eslint_8.41.0.tgz";
+        name = "eslint___eslint_8.42.0.tgz";
-        url = "https://registry.yarnpkg.com/eslint/-/eslint-8.41.0.tgz";
+        url = "https://registry.yarnpkg.com/eslint/-/eslint-8.42.0.tgz";
-        sha512 = "WQDQpzGBOP5IrXPo4Hc0814r4/v2rrIsB0rhT7jtunIalgg6gYXWhRMOejVO8yH21T/FGaxjmFjBMNqcIlmH1Q==";
+        sha512 = "ulg9Ms6E1WPf67PHaEY4/6E2tEn5/f7FXGzr3t9cBMugOmf1INYvuUwwh1aXQN4MfJ6a5K2iNwP3w4AColvI9A==";
       };
     }
     {

flake.lock

@@ -259,11 +259,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1685677062,
+        "lastModified": 1685780302,
-        "narHash": "sha256-zoHF7+HNwNwne2XEomphbdc4Y8tdWT16EUxUTXpOKpQ=",
+        "narHash": "sha256-NckUaSu5MxNGC9bctaiZEwjSxbJm9jVj3qHq/zwamvA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "95be94370d09f97f6af6a1df1eb9649b5260724e",
+        "rev": "15fded2696f08d5550b00de4661b352d41e2374a",
         "type": "github"
       },
       "original": {

matrix/mautrix-discord/source.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/mautrix/discord",
-  "rev": "1c606e97a67696b3d39b5a5bbc62c09ac05ee5cd",
+  "rev": "8c57b7a69bb4a7b3dfff5f0b48968569ac5ec65c",
-  "date": "2023-05-31T11:45:10+03:00",
+  "date": "2023-06-02T20:38:56+03:00",
-  "path": "/nix/store/mhlnqlf2hjvj14s0x979740v6kvj5iqm-discord",
+  "path": "/nix/store/235zm5piyh42rl2wb910yckv6vjy2w7j-discord",
-  "sha256": "1dr2z1rypddaij7fmqq6jr2kcr8c94gp9psinf7wpx15z0gr3cfl",
+  "sha256": "1ljk7rw309rcxr3ln37giz3g761233f8iwwdvq82whyx7kp9m32b",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

matrix/mautrix-whatsapp/source.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/mautrix/whatsapp",
-  "rev": "140eea0bd2222b624e13c2e97effb2f54901c75d",
+  "rev": "5eba642a4d1a11af5589e3d53a9a55b5ccc7dee2",
-  "date": "2023-06-01T15:42:13+03:00",
+  "date": "2023-06-02T15:42:43+03:00",
-  "path": "/nix/store/f6px6cc60ynj7skirawckmzfyl5lf3j5-whatsapp",
+  "path": "/nix/store/vvm3pya6bp6rkn19dp7frqc9a6bx8agd-whatsapp",
-  "sha256": "0n8bxyl6r7w05c20mks626mjyb0wwd8ish0kg5iqf0hripmzbkma",
+  "sha256": "1g4xw248xlzbyycwzg6a5sy2bif0i8024yidks8wignfknkpkki8",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

plover/plover-rkb1-hid.nix

@@ -1,7 +1,7 @@
 {
   callPackage,
   buildPythonPackage,
-  fetchFromGitea,
+  fetchgit,
   lib,
   pythonOlder,
   hid,
@@ -10,14 +10,11 @@
   plover = callPackage ./plover {};
   source = builtins.fromJSON (builtins.readFile ./plover-rkb1-hid.json);
 in
-  buildPythonPackage rec {
+  buildPythonPackage {
     pname = "plover_machine_hid";
     version = source.date;
-    src = fetchFromGitea {
+    src = fetchgit {
-      domain = "git.chir.rs";
+      inherit (source) rev sha256 url;
-      owner = "darkkirb";
-      repo = "plover-machine-hid";
-      inherit (source) rev sha256;
     };
 
     doCheck = false;