From f41f71993532cc53bbe98b36dab5707626bf1338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Wed, 8 Feb 2023 15:58:24 +0100 Subject: [PATCH 1/2] manual update --- akkoma/pleroma-fe/source.json | 8 +++--- akkoma/source.json | 8 +++--- ci/drone-runner-docker/source.json | 8 +++--- flake.lock | 36 +++++++++++++-------------- matrix/mautrix-discord/source.json | 8 +++--- matrix/mautrix-discord/vendor.sha256 | 2 +- matrix/mautrix-signal/source.json | 8 +++--- matrix/mautrix-whatsapp/source.json | 8 +++--- matrix/mautrix-whatsapp/vendor.sha256 | 2 +- plover/didoesdigital-dictionary.json | 8 +++--- 10 files changed, 48 insertions(+), 48 deletions(-) diff --git a/akkoma/pleroma-fe/source.json b/akkoma/pleroma-fe/source.json index d4c99e0..88e9dba 100644 --- a/akkoma/pleroma-fe/source.json +++ b/akkoma/pleroma-fe/source.json @@ -1,9 +1,9 @@ { "url": "https://akkoma.dev/AkkomaGang/pleroma-fe.git", - "rev": "b4b13d777f7170c43cc3e5e73804897c207cf090", - "date": "2023-01-27T10:08:17+00:00", - "path": "/nix/store/ysdl7ycrx007k9qnczp0ivic7i1p6y0i-pleroma-fe", - "sha256": "0b956a2agnypqs85yfp43p8vgvz304nqkvnwg947xvb4fvj8r7py", + "rev": "9e04e4fd80c9396897df26e50261e41b25a15ffc", + "date": "2023-02-04T21:10:06+00:00", + "path": "/nix/store/1id60jg0064vhq0dli30a9xm6pr1mdp5-pleroma-fe", + "sha256": "1harqyjy1pkfw9qzp8v0f2gi4i30id0wg3g7d6ppvbp4c5ni0w6d", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/akkoma/source.json b/akkoma/source.json index c3d19bd..e80d53f 100644 --- a/akkoma/source.json +++ b/akkoma/source.json @@ -1,9 +1,9 @@ { "url": "https://akkoma.dev/AkkomaGang/akkoma.git", - "rev": "d601ddeb9153780e885918892a5017a0d0e2c400", - "date": "2023-01-27T10:06:49+00:00", - "path": "/nix/store/mskjfjmm4zn8p40fscwyhc5i89svhb8k-akkoma", - "sha256": "006sqpkaz54gxcgwqk2ix5aypmgryhrmdsdifbji339rb0vnpp4z", + "rev": "b71db2f82d91a6ae1406658374f15d948d8ad7e3", + "date": "2023-02-04T21:00:21+00:00", + "path": "/nix/store/z81cdzsrp7056dv7c5i89zb1qw4wgrrk-akkoma", + "sha256": "1i90lh3fcyh90frg21v3dr68qzczcxp74idfw4v3b3qs37fzggq2", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/ci/drone-runner-docker/source.json b/ci/drone-runner-docker/source.json index 0aec3eb..f71b410 100644 --- a/ci/drone-runner-docker/source.json +++ b/ci/drone-runner-docker/source.json @@ -1,9 +1,9 @@ { "url": "https://github.com/drone-runners/drone-runner-docker", - "rev": "ecfb097ea73c200a6817946120660252e9afdcac", - "date": "2023-01-06T10:43:12+00:00", - "path": "/nix/store/iiivx7hbj6zrxpm08jdricfk5wqrxigw-drone-runner-docker", - "sha256": "0vgljdsnl41yjfjbnjwf1qwiax574i40g97qlxqih5grwh51x136", + "rev": "7e9969423c0883c0300c974bbb7583e3d9ece875", + "date": "2023-01-31T11:26:39+00:00", + "path": "/nix/store/di6ahlqfjgpac2s2y8xcxz0a8nhghxnz-drone-runner-docker", + "sha256": "0k28w2s8ck0k37wajp0370gijzyjp88fgn6n8ywnyda9fba0q8yw", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/flake.lock b/flake.lock index b878967..a489c53 100644 --- a/flake.lock +++ b/flake.lock @@ -13,11 +13,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1674800265, - "narHash": "sha256-i9D3Ne4ktffiNfyM+jp7dOhRDkktm2SgtBCxkkFZP5E=", + "lastModified": 1675737550, + "narHash": "sha256-dTQvZJ1PRzyFXllpFRStaV5YI0LhTqzzsMfyZzh0Vj8=", "owner": "zhaofengli", "repo": "attic", - "rev": "54d93ff61f98639d41d7897f7059aacabcb07772", + "rev": "fce89f4c954869290d2cf179b1540776ea329ebc", "type": "github" }, "original": { @@ -43,11 +43,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1672095661, - "narHash": "sha256-7NTsdCn3qsvU7A+1/7tY8pxbq0DYy1pFYNpzN6he9lI=", + "lastModified": 1675451374, + "narHash": "sha256-WRV5qJqJuhdPirb2IBwGJgJrZk6sA4Nfj0KwUrONg98=", "owner": "ipetkov", "repo": "crane", - "rev": "98894bb39b03bfb379c5e10523cd61160e1ac782", + "rev": "9aebc95cd1e12761ad593aeb0c26bc0785015b7f", "type": "github" }, "original": { @@ -59,11 +59,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -105,11 +105,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1674984656, - "narHash": "sha256-ckWTlwsjilHXKHXEcJRmo3ZQbXX0GQJt7RA5sdbQ6Vo=", + "lastModified": 1675863634, + "narHash": "sha256-nlLz0jh0nYc2Suw1agrRJxRnqVG5bAV2dq9Dwm2BEtg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e831219a571ff15e887bbdda544b539902bfab61", + "rev": "9313ae3ba50422fb5b916103dcca9d77898264fa", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1673800717, - "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", + "lastModified": 1675327819, + "narHash": "sha256-Fd2BUNUsTO7wmoU1fbOC4HNkl370dYdkfKgWPretuj0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", + "rev": "21efc622b939884db3c92f49d638ca89f12f22f8", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1670034122, - "narHash": "sha256-EqmuOKucPWtMvCZtHraHr3Q3bgVszq1x2PoZtQkUuEk=", + "lastModified": 1675391458, + "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a0d5773275ecd4f141d792d3a0376277c0fc0b65", + "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", "type": "github" }, "original": { diff --git a/matrix/mautrix-discord/source.json b/matrix/mautrix-discord/source.json index 554b056..33ae6c9 100644 --- a/matrix/mautrix-discord/source.json +++ b/matrix/mautrix-discord/source.json @@ -1,9 +1,9 @@ { "url": "https://github.com/mautrix/discord", - "rev": "10d26a7baa7289bc1b8ea73692615f2b22335f49", - "date": "2023-01-29T02:13:02+02:00", - "path": "/nix/store/cb5hhfkmv6l22rlsyqmmgr9819nv4r1p-discord", - "sha256": "03q7zb75lnl7ncps2hiwnhd9zp0r7cmjxaakv2vl3k6fq0d84073", + "rev": "3e5baa502eb5453e2a8bd4e3fed43c938d4e1c0e", + "date": "2023-02-04T16:33:40+02:00", + "path": "/nix/store/yrflscqfwhcd9l6hs94v4sc9z33bi38i-discord", + "sha256": "0mk66nk1z6jn89vl7awar8zz6ygvnisfi2bnp18i94ds6h5bcxcm", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/matrix/mautrix-discord/vendor.sha256 b/matrix/mautrix-discord/vendor.sha256 index 2091d40..fd598da 100644 --- a/matrix/mautrix-discord/vendor.sha256 +++ b/matrix/mautrix-discord/vendor.sha256 @@ -1 +1 @@ -sha256-NSwmgtzIqQadWetep28U78Ukodhk1jGlr9VriCB9qUE= +sha256-RpiatkjEGsgj2ed9ufJFxW67FM1eDext58nvZwda/Vw= diff --git a/matrix/mautrix-signal/source.json b/matrix/mautrix-signal/source.json index 696f36e..f543884 100644 --- a/matrix/mautrix-signal/source.json +++ b/matrix/mautrix-signal/source.json @@ -1,9 +1,9 @@ { "url": "https://github.com/mautrix/signal", - "rev": "bbd6f7cd6647581b747ef1847d47b2572d4bf886", - "date": "2023-01-28T12:34:52+02:00", - "path": "/nix/store/r0plmrymg9xmv4r35qaq93l9vx5ph55j-signal", - "sha256": "18xwdlxqfqgyi0yn62lydq8jpq4brig3h67bbq8z2ynmv5y7axr9", + "rev": "c7fa21c1ed3345fa7f3e03cc2c767850d29eebdd", + "date": "2023-02-03T10:53:21-05:00", + "path": "/nix/store/k09g3j49z1lgi5chrbhkr3p79hpg0xr1-signal", + "sha256": "1nmyg5b8yzhmndy5b6wq3y1q14mii7c1rbh6a5455fmbh01mwdhq", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/matrix/mautrix-whatsapp/source.json b/matrix/mautrix-whatsapp/source.json index 70ead4c..4cd5739 100644 --- a/matrix/mautrix-whatsapp/source.json +++ b/matrix/mautrix-whatsapp/source.json @@ -1,9 +1,9 @@ { "url": "https://github.com/mautrix/whatsapp", - "rev": "e5d32cc1e2b2bec4ff79fe34ce89c8e0e49e4041", - "date": "2023-01-28T21:51:40+02:00", - "path": "/nix/store/cn7lzrbqvi8vn16nb7jh7nw692avgi2a-whatsapp", - "sha256": "0c8fidr8ks97qany3bvk1377s3hpmpdcdpm1i1gmjsz7ak4nq9dq", + "rev": "08fe836b8a6b31d205f446d80da69621f1aa28ce", + "date": "2023-02-05T01:01:42+02:00", + "path": "/nix/store/wqpy97kl8d606wfjkw6znnn220ccfj7d-whatsapp", + "sha256": "1q3g1j940m55zngyplvlqxnkilp2s5g2ipgfm6gd0gai8zxx5hgh", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/matrix/mautrix-whatsapp/vendor.sha256 b/matrix/mautrix-whatsapp/vendor.sha256 index 9587c15..bfd369f 100644 --- a/matrix/mautrix-whatsapp/vendor.sha256 +++ b/matrix/mautrix-whatsapp/vendor.sha256 @@ -1 +1 @@ -sha256-fpyYEhE6g81cnd3a70wxi7C104UHMWGwFiLfDmeL37Q= +sha256-BlKzSplZwS+yyq+CFimcRKdevWjyePn5WxOIb6jQcHU= diff --git a/plover/didoesdigital-dictionary.json b/plover/didoesdigital-dictionary.json index ee9d670..e34e675 100644 --- a/plover/didoesdigital-dictionary.json +++ b/plover/didoesdigital-dictionary.json @@ -1,9 +1,9 @@ { "url": "https://github.com/didoesdigital/steno-dictionaries", - "rev": "e2556e840bb52c4d4b4c0dabdf8c1d010af8ac99", - "date": "2023-01-21T10:26:34+10:00", - "path": "/nix/store/l5qdgc8cc4xw9qvsqky462vkv3irr8ak-steno-dictionaries", - "sha256": "0z7z1kvl54p7mxl00ksq2zhzbc5qjqjnznlg1qccqgl57p7zn5ak", + "rev": "90c9cf6f0d6b7f046fcedbc78a2240b9fc234954", + "date": "2023-02-05T18:45:10+10:00", + "path": "/nix/store/dx86jhwvncnlrqjd68clk1cqd129i5ij-steno-dictionaries", + "sha256": "1cflydrylzk62h0dnd5mmlnz6014icyy3cvj2gfzz8dhd3xd79xs", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, From 35ab0c97002e2ab300e94d19f6b264ca1a4c6bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Wed, 8 Feb 2023 21:05:09 +0100 Subject: [PATCH 2/2] =?UTF-8?q?don=E2=80=99t=20follow=20nixpkgs=20for=20at?= =?UTF-8?q?tic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 28 +++++++++++++++++++++------- flake.nix | 2 +- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index a489c53..834f5ec 100644 --- a/flake.lock +++ b/flake.lock @@ -7,9 +7,7 @@ "flake-utils": [ "flake-utils" ], - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -105,16 +103,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1675863634, - "narHash": "sha256-nlLz0jh0nYc2Suw1agrRJxRnqVG5bAV2dq9Dwm2BEtg=", + "lastModified": 1675153841, + "narHash": "sha256-EWvU3DLq+4dbJiukfhS7r6sWZyJikgXn6kNl7eHljW8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9313ae3ba50422fb5b916103dcca9d77898264fa", + "rev": "ea692c2ad1afd6384e171eabef4f0887d2b882d3", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", + "rev": "ea692c2ad1afd6384e171eabef4f0887d2b882d3", "type": "github" } }, @@ -134,12 +133,27 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1675863634, + "narHash": "sha256-nlLz0jh0nYc2Suw1agrRJxRnqVG5bAV2dq9Dwm2BEtg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9313ae3ba50422fb5b916103dcca9d77898264fa", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "attic": "attic", "flake-compat": "flake-compat_2", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" } }, "rust-overlay": { diff --git a/flake.nix b/flake.nix index 5ef5143..9b50478 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ flake-utils.url = "github:numtide/flake-utils"; attic = { url = "github:zhaofengli/attic"; - inputs.nixpkgs.follows = "nixpkgs"; + #inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; }; flake-compat = {