From 43b444b225724faf3fd5af24b8e7937c061625ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sat, 18 Feb 2023 22:15:44 -0300 Subject: [PATCH] update --- flake.lock | 188 ++++++++++++++++++++++++++++++-------- overlays/default.nix | 2 +- system/media-packages.nix | 2 +- 3 files changed, 154 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index 184f454..adf452d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,16 +1,32 @@ { "nodes": { + "advisory-db": { + "flake": false, + "locked": { + "lastModified": 1675868798, + "narHash": "sha256-ghS+rNMYKidm9HQtRQQ1SRs30SXRR11s73GjtXfyWG4=", + "owner": "rustsec", + "repo": "advisory-db", + "rev": "b485cf4db1e37d03433c505c7675c2656f59874a", + "type": "github" + }, + "original": { + "owner": "rustsec", + "repo": "advisory-db", + "type": "github" + } + }, "agenix": { "inputs": { "darwin": "darwin", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1675176355, - "narHash": "sha256-Qjxh5cmN56siY97mzmBLI1+cdjXSPqmfPVsKxBvHmwI=", + "lastModified": 1676599101, + "narHash": "sha256-CKS6UsOGhoNxGDBt9wyFiWHvtng/+BMAJ4G8ahhe1DE=", "owner": "ryantm", "repo": "agenix", - "rev": "b7ffcfe77f817d9ee992640ba1f270718d197f28", + "rev": "de657061b13cf329c57a1a9730a5049a971b40b3", "type": "github" }, "original": { @@ -35,6 +51,30 @@ "type": "github" } }, + "crane": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": [ + "demoji", + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1675814591, + "narHash": "sha256-RuO67fK41LFbKmcE3m1BoIAfFOcrpAlk0jGso/kWK1c=", + "owner": "ipetkov", + "repo": "crane", + "rev": "972ef2af69c4b25ec6c8583f55f7b07c956c811c", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -59,16 +99,19 @@ }, "demoji": { "inputs": { + "advisory-db": "advisory-db", + "crane": "crane", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1674276435, - "narHash": "sha256-afFuY8qcgZYtRmHa7Ifq7QDcEH3o7dxAS4L62aSeQmM=", + "lastModified": 1675902856, + "narHash": "sha256-UBqpR/Q30ReJcn/9IEfFh73FAwQBDCQuXascL2wRL6I=", "owner": "lelgenio", "repo": "demoji", - "rev": "afe472b3e32258a0073975581b4827f11efe55b0", + "rev": "19ece997612431023f5a603f21b91d5e8062a2ec", "type": "github" }, "original": { @@ -80,7 +123,7 @@ "dhist": { "inputs": { "fenix": "fenix", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] @@ -158,13 +201,29 @@ "type": "github" } }, + "flake-compat": { + "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": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -188,6 +247,36 @@ "type": "github" } }, + "flake-utils_3": { + "locked": { + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -196,11 +285,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1674440933, - "narHash": "sha256-CASRcD/rK3fn5vUCti3jzry7zi0GsqRsBohNq9wPgLs=", + "lastModified": 1676257154, + "narHash": "sha256-eW3jymNLpdxS5fkp9NWKyNtgL0Gqtgg1vCTofKXDF1g=", "owner": "nix-community", "repo": "home-manager", - "rev": "65c47ced082e3353113614f77b1bc18822dc731f", + "rev": "2cb27c79117a2a75ff3416c3199a2dc57af6a527", "type": "github" }, "original": { @@ -220,11 +309,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1675689419, - "narHash": "sha256-UyCVZVhkZiisMPjfDTAzQIe0YpIkN1Gic97bie3Kf0A=", + "lastModified": 1676682541, + "narHash": "sha256-ltfODM3ZvqygHqbglHoiMO7Qxmdi2Z1tzVtRfXDE//0=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "863812a0979646fbc1a51b6593fa25fbad77a7be", + "rev": "b944386ca54cf650d660caac31f065c0211168b1", "type": "github" }, "original": { @@ -288,18 +377,18 @@ }, "nil-lsp": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs-unstable" ], - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1675471872, - "narHash": "sha256-HBW6qBF/niMbdFxTuucSnDda9H/RSbbOs48fcXXImx0=", + "lastModified": 1676390054, + "narHash": "sha256-w0KvrM+9WIEYr0juDh4Vs39ed2IaT0T696fp9pZ7i1I=", "owner": "oxalica", "repo": "nil", - "rev": "1a15174958729ca578db517e735479ed5fb963db", + "rev": "944d5c335531778a1d7b54a97bf7fb5ec0c3e976", "type": "github" }, "original": { @@ -315,11 +404,11 @@ ] }, "locked": { - "lastModified": 1675567746, - "narHash": "sha256-huugg+7ok2VjmoLhkT+mAcw6iVK+hOqrYV0jMMD4EpQ=", + "lastModified": 1676172252, + "narHash": "sha256-Q5yJPpgbvOTgB0NQTJmlx3di1Sj5QQhSrjv38u6MzsQ=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "3880fa89727c622ae4674a2b6169c81112b43cf4", + "rev": "89e3b689e0ae9bac4c6cdc24d1085d81baeebde4", "type": "github" }, "original": { @@ -346,11 +435,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1675673983, - "narHash": "sha256-8hzNh1jtiPxL5r3ICNzSmpSzV7kGb3KwX+FS5BWJUTo=", + "lastModified": 1676569297, + "narHash": "sha256-2n4C4H3/U+3YbDrQB6xIw7AaLdFISCCFwOkcETAigqU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a350a8f31bb7ef0c6e79aea3795a890cf7743d4", + "rev": "ac1f5b72a9e95873d1de0233fddcb56f99884b37", "type": "github" }, "original": { @@ -361,11 +450,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1675681488, - "narHash": "sha256-0E/oYpixC+joFk7UrY60TwZcdthzP2BXmJwne3Ni8ZI=", + "lastModified": 1676636606, + "narHash": "sha256-Hahkda+Amu3RQE0C6UIxLo1x8tkDmu8jkFRa8JujFos=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "13fdd3945d8a2da5e4afe35d8a629193a9680911", + "rev": "de5448dab588ad41aef40f8c7c0c230981656698", "type": "github" }, "original": { @@ -376,11 +465,11 @@ }, "nur": { "locked": { - "lastModified": 1675806285, - "narHash": "sha256-s2UNSRVUSu3srjIUuWlFEznu9Gpeh9CFPeYJQgXxS94=", + "lastModified": 1676727992, + "narHash": "sha256-6ENqec+nlvKhrbJh4ok8ytOcufcjrinTHxh2HJj6y44=", "owner": "nix-community", "repo": "NUR", - "rev": "ee91675b2b155b274137fe6d2d3a6e29a63a862f", + "rev": "c8a97c47eef60bf0151d27290d39bbe1101f4b27", "type": "github" }, "original": { @@ -479,6 +568,33 @@ } }, "rust-overlay": { + "inputs": { + "flake-utils": [ + "demoji", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "demoji", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1675391458, + "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { "inputs": { "flake-utils": [ "nil-lsp", @@ -541,11 +657,11 @@ ] }, "locked": { - "lastModified": 1675189325, - "narHash": "sha256-Xa0e3gc2q6yXKGcJEu19NFWkLiFESKi3Mg4xgenDprc=", + "lastModified": 1676279842, + "narHash": "sha256-pkK8f55xkit6BP1kwQP3VJ3mfZEuqxy98n3UoWcGrB8=", "owner": "wegank", "repo": "nur-packages", - "rev": "f2336f1b0d1a6cc8d6157e8d6a16c841691cd6b3", + "rev": "939579a8f228b7439a4cbb82ba90dac97981ce25", "type": "github" }, "original": { diff --git a/overlays/default.nix b/overlays/default.nix index 3993d6c..ad15c6e 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -40,7 +40,7 @@ new-packages = (final: prev: packages // { dhist = inputs.dhist.packages.${prev.system}.dhist; - demoji = inputs.demoji.packages.${prev.system}.demoji; + demoji = inputs.demoji.packages.${prev.system}.default; dzgui = inputs.dzgui.packages.${prev.system}.dzgui; mpvpaper = inputs.wegank.packages.${prev.system}.mpvpaper; diff --git a/system/media-packages.nix b/system/media-packages.nix index 6db1da1..ffaff88 100644 --- a/system/media-packages.nix +++ b/system/media-packages.nix @@ -11,7 +11,7 @@ in { ffmpeg imagemagick mpc-cli - helvum + pkgs.unstable.helvum gimp inkscape kdenlive