From 095f33c606d71d1de654ea73166e0743e6540d70 Mon Sep 17 00:00:00 2001 From: mat ess Date: Sat, 8 Apr 2023 15:16:35 -0400 Subject: [PATCH] Bumps --- flake.lock | 177 ++++++++++++++++++++++++++------------ pkgs/default.nix | 2 +- pkgs/ia-writer-family.nix | 3 - 3 files changed, 122 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index 712281a..ec45547 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "lastModified": 1680266963, + "narHash": "sha256-IW/lzbUCOcldLHWHjNSg1YoViDnZOmz0ZJL7EH9OkV8=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "rev": "99d4187d11be86b49baa3a1aec0530004072374f", "type": "github" }, "original": { @@ -55,10 +55,6 @@ }, "dream2nix": { "inputs": { - "alejandra": [ - "helix", - "nci" - ], "all-cabal-json": [ "helix", "nci" @@ -68,6 +64,8 @@ "helix", "nci" ], + "drv-parts": "drv-parts", + "flake-compat": "flake-compat", "flake-parts": [ "helix", "nci", @@ -98,6 +96,7 @@ "nci", "nixpkgs" ], + "nixpkgsV1": "nixpkgsV1", "poetry2nix": [ "helix", "nci" @@ -112,11 +111,11 @@ ] }, "locked": { - "lastModified": 1677289985, - "narHash": "sha256-lUp06cTTlWubeBGMZqPl9jODM99LpWMcwxRiscFAUJg=", + "lastModified": 1680258209, + "narHash": "sha256-lEo50RXI/17/a9aCIun8Hz62ZJ5JM5RGeTgclIP+Lgc=", "owner": "nix-community", "repo": "dream2nix", - "rev": "28b973a8d4c30cc1cbb3377ea2023a76bc3fb889", + "rev": "6f512b5a220fdb26bd3c659f7b55e4f052ec8b35", "type": "github" }, "original": { @@ -125,14 +124,49 @@ "type": "github" } }, + "drv-parts": { + "inputs": { + "flake-compat": [ + "helix", + "nci", + "dream2nix", + "flake-compat" + ], + "flake-parts": [ + "helix", + "nci", + "dream2nix", + "flake-parts" + ], + "nixpkgs": [ + "helix", + "nci", + "dream2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1680172861, + "narHash": "sha256-QMyI338xRxaHFDlCXdLCtgelGQX2PdlagZALky4ZXJ8=", + "owner": "davhau", + "repo": "drv-parts", + "rev": "ced8a52f62b0a94244713df2225c05c85b416110", + "type": "github" + }, + "original": { + "owner": "davhau", + "repo": "drv-parts", + "type": "github" + } + }, "fisher-src": { "flake": false, "locked": { - "lastModified": 1676182491, - "narHash": "sha256-tBR8dTz621B3RJccYJbq5w8hppoc74qJRoerqXDxMns=", + "lastModified": 1678437028, + "narHash": "sha256-rtWPiEalxUhZQMZ8Ydk3E4wKke+Pdl7WaM4iOEKYuvM=", "owner": "jorgebucaran", "repo": "fisher", - "rev": "5841ec009104f82dae882efebbb17603f7b6a537", + "rev": "67bec738dbec2442d05d09ef72b2be82acb1d774", "type": "github" }, "original": { @@ -157,13 +191,29 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1680946745, + "narHash": "sha256-KqGlwg9UTDsFBZZB8wzXgMnc8XQm95LtSbFvBsnqkPI=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "946da791763db1c306b86a8bd3828bf5814a1247", "type": "github" }, "original": { @@ -218,11 +268,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1678148451, - "narHash": "sha256-wUrIZHhLmj5HENyA20ErHFHfJpzi+5XhUMI7B6cv5jY=", + "lastModified": 1680958354, + "narHash": "sha256-lU5r4RgrRmlqiRsefZFahvD/bsnKJbVHNRwRjBXg3fY=", "owner": "helix-editor", "repo": "helix", - "rev": "53c8dcea5bc2e77706a1272cf0562121005bf54f", + "rev": "58e457a4e1037caf43c17dea93c5321c1ae74103", "type": "github" }, "original": { @@ -241,11 +291,11 @@ ] }, "locked": { - "lastModified": 1678109311, - "narHash": "sha256-Q64FoCH5rp3XHoC8u1+KyjLEFGTY7kX9YaIaYfugvfY=", + "lastModified": 1680667162, + "narHash": "sha256-2vgxK4j42y73S3XB2cThz1dSEyK9J9tfu4mhuEfAw68=", "owner": "nix-community", "repo": "home-manager", - "rev": "04d6cad67557512452decbfe888c68fa11338a96", + "rev": "440faf5ae472657ef2d8cc7756d77b6ab0ace68d", "type": "github" }, "original": { @@ -272,11 +322,11 @@ "ia-writer-family-src": { "flake": false, "locked": { - "lastModified": 1663752357, - "narHash": "sha256-sgYsOn6iXE9f0hlDZX1uA3WnTAY1zc5/U9JOcjn5uGw=", + "lastModified": 1679993830, + "narHash": "sha256-qfxCZ38n7oSf2fxaXc/I+vTiUTHFnvHKohIciwOT0Y0=", "owner": "iaolo", "repo": "iA-Fonts", - "rev": "8548eea983611993db2d6f65bd3ae1609f62dcbd", + "rev": "09947469526cb474f1b68c87dffabd81767c4655", "type": "github" }, "original": { @@ -304,11 +354,11 @@ "kitty-themes": { "flake": false, "locked": { - "lastModified": 1676775915, - "narHash": "sha256-2OleF/ROoeCb2xkr2IZoUvp4i8SkT0pMGMIYtON0MC8=", + "lastModified": 1678282211, + "narHash": "sha256-heJayOz/2Bey/zAwL2PR1OsfGyCPqMyxT1XzwHLhQ0w=", "owner": "kovidgoyal", "repo": "kitty-themes", - "rev": "0f224087587b1b9ce8ef6a5f68ce8004efbce66a", + "rev": "c01fcbd694353507c3cc7f657179bad1f32140a7", "type": "github" }, "original": { @@ -348,11 +398,11 @@ ] }, "locked": { - "lastModified": 1677297103, - "narHash": "sha256-ArlJIbp9NGV9yvhZdV0SOUFfRlI/kHeKoCk30NbSiLc=", + "lastModified": 1680329418, + "narHash": "sha256-+KN0eQLSZvL1J0kDO8/fxv0UCHTyZCADLmpIfeeiSGo=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "a79272a2cb0942392bb3a5bf9a3ec6bc568795b2", + "rev": "98c1d2ff5155f0fee5d290f6b982cb990839d540", "type": "github" }, "original": { @@ -363,11 +413,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1678086707, - "narHash": "sha256-y1uXdxzinIne4FW3TF7DCtxEB9gAbQ4qnbpYzhvkFm8=", + "lastModified": 1680942619, + "narHash": "sha256-kpCW1IegAZfEjCVJW7IPN/hEtRL/9dxaFFYiHS5qVAk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "21eda9bc80bef824a037582b1e5a43ba74e92daa", + "rev": "6f95dd4fd050daf017cae2dfeb1cea1ec0e4c1a1", "type": "github" }, "original": { @@ -380,11 +430,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1675183161, - "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", + "lastModified": 1678375444, + "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", + "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e", "type": "github" }, "original": { @@ -397,11 +447,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1678144297, - "narHash": "sha256-JhyIRENtFteoDctaGh3INI1RmDPKY++x0z7gml74tCg=", + "lastModified": 1680977908, + "narHash": "sha256-0Ehcgswo51+dx+QH5sZBqUOZh4JeTgrnxGTACSn8ZkA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33c9fd85e52f925e05f4a6bd69811f97e5ccdc15", + "rev": "54731a8cea6d8b9d4fcb9ca7cbfc75ae1e07a171", "type": "github" }, "original": { @@ -413,11 +463,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1678101631, - "narHash": "sha256-vuuvWBNGhNSPPbFCjp2XZmBqJOvsFF1T0hyleRnHZlc=", + "lastModified": 1680899675, + "narHash": "sha256-3ogGOPFcSuhf7NrPNREFApkGkLBR2og5lyBJY7+mbig=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "934e613c31cf7af0624dcf088b9e2d9b802d0717", + "rev": "d426ae4241ef89fcbd646cd796abd3e83167f54d", "type": "github" }, "original": { @@ -427,6 +477,21 @@ "type": "github" } }, + "nixpkgsV1": { + "locked": { + "lastModified": 1678500271, + "narHash": "sha256-tRBLElf6f02HJGG0ZR7znMNFv/Uf7b2fFInpTHiHaSE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5eb98948b66de29f899c7fe27ae112a47964baf8", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-22.11", + "type": "indirect" + } + }, "parts": { "inputs": { "nixpkgs-lib": [ @@ -436,11 +501,11 @@ ] }, "locked": { - "lastModified": 1675933616, - "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=", + "lastModified": 1679737941, + "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "47478a4a003e745402acf63be7f9a092d51b83d7", + "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", "type": "github" }, "original": { @@ -454,11 +519,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1675933616, - "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=", + "lastModified": 1679737941, + "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "47478a4a003e745402acf63be7f9a092d51b83d7", + "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", "type": "github" }, "original": { @@ -469,7 +534,7 @@ }, "pre-commit": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-utils": [ "flake-utils" ], @@ -482,11 +547,11 @@ ] }, "locked": { - "lastModified": 1677832802, - "narHash": "sha256-XQf+k6mBYTiQUjWRf/0fozy5InAs03O1b30adCpWeXs=", + "lastModified": 1680948944, + "narHash": "sha256-GYVDP6QHkHfj6FEgVny78BjwpNfPgoU8NE3oFt//DFY=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "382bee738397ca005206eefa36922cc10df8a21c", + "rev": "b718acb57c432afe527f89672d00542fcd59fd68", "type": "github" }, "original": { @@ -522,11 +587,11 @@ ] }, "locked": { - "lastModified": 1677292251, - "narHash": "sha256-D+6q5Z2MQn3UFJtqsM5/AvVHi3NXKZTIMZt1JGq/spA=", + "lastModified": 1680315536, + "narHash": "sha256-0AsBuKssJMbcRcw4HJQwJsUHhZxR5+gaf6xPQayhR44=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "34cdbf6ad480ce13a6a526f57d8b9e609f3d65dc", + "rev": "5c8c151bdd639074a0051325c16df1a64ee23497", "type": "github" }, "original": { diff --git a/pkgs/default.nix b/pkgs/default.nix index 8fbc4e7..7b834b6 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -16,7 +16,7 @@ _: prev: { { cinny = { }; dark-mode-notify = { - sdkVersion = "14.2"; + sdkVersion = "14.*"; }; ia-writer-family = { }; yubiswitch = { }; diff --git a/pkgs/ia-writer-family.nix b/pkgs/ia-writer-family.nix index 8bc5745..37a32c4 100644 --- a/pkgs/ia-writer-family.nix +++ b/pkgs/ia-writer-family.nix @@ -9,10 +9,7 @@ stdenv.mkDerivation { src = ia-writer-family-src; installPhase = '' - ls - mkdir -p $out/share/fonts/opentype mkdir -p $out/share/fonts/truetype - cp "iA Writer Duospace/OTF (Mac)/"*.otf $out/share/fonts/opentype/ cp "iA Writer "{Mono,Duo,Quattro}/Variable/*.ttf $out/share/fonts/truetype/ '';