diff options
| -rw-r--r-- | .envrc | 1 | ||||
| -rw-r--r-- | PACKAGES.md | 13 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | default.nix | 21 | ||||
| -rw-r--r-- | flake.lock | 111 | ||||
| -rw-r--r-- | flake.nix | 81 | ||||
| -rw-r--r-- | pkgs/swhkd.nix | 37 | ||||
| -rw-r--r-- | pkgs/swhkd/default.nix | 40 | ||||
| -rw-r--r-- | pkgs/swhkd/update-lock.patch | 670 | ||||
| -rw-r--r-- | pkgs/treefetch.nix | 40 |
10 files changed, 777 insertions, 241 deletions
@@ -1 +0,0 @@ -use flake diff --git a/PACKAGES.md b/PACKAGES.md deleted file mode 100644 index d44a340..0000000 --- a/PACKAGES.md +++ /dev/null @@ -1,13 +0,0 @@ -# packages list - -## original packages - -- [treefetch](https://github.com/angelofallars/treefetch) -- [gradience](https://gradienceteam.github.io/) -- [python3Packages.material-color-utilities](https://github.com/avanisubbiah/material-color-utilities-python) -- [swhkd](https://github.com/waycrate/swhkd) - -## package overrides - -- discord-canary - - `{withOpenASAR = true;}` @@ -2,10 +2,6 @@ my personal nix overlay :) -## current packages - -see [PACKAGES.md](https://github.com/getchoo/overlay/blob/main/PACKAGES.md) - ## how to use ### flake configuration diff --git a/default.nix b/default.nix index a26e67c..c7d0c26 100644 --- a/default.nix +++ b/default.nix @@ -1,9 +1,14 @@ -(import ( - fetchTarball { - url = "https://github.com/edolstra/flake-compat/archive/99f1c2157fba4bfe6211a321fd0ee43199025dbf.tar.gz"; - sha256 = "0x2jn3vrawwv9xp15674wjz9pixwjyj3j771izayl962zziivbx2"; - } - ) { - src = ./.; - }) +( + import + ( + let + lock = builtins.fromJSON (builtins.readFile ./flake.lock); + in + fetchTarball { + url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; + sha256 = lock.nodes.flake-compat.locked.narHash; + } + ) + {src = ./.;} +) .defaultNix @@ -16,124 +16,25 @@ "type": "github" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "naersk": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1671096816, - "narHash": "sha256-ezQCsNgmpUHdZANDCILm3RvtO1xH8uujk/+EqNvzIOg=", - "owner": "nix-community", - "repo": "naersk", - "rev": "d998160d6a076cfe8f9741e56aeec7e267e3e114", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1677655566, - "narHash": "sha256-I8G8Lmpp3YduYl4+pkiIJFGT1WKw+8ZMH2QwANkTu2U=", + "lastModified": 1681741787, + "narHash": "sha256-WQx8gXNUrwWTEkvdGs+6pbVIitFSoo3U2GAg0A8qqhY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae8bdd2de4c23b239b5a771501641d2ef5e027d0", + "rev": "061715af6da2a938dab3b645c33c3fa2415ca9d6", "type": "github" }, "original": { "id": "nixpkgs", + "ref": "nixos-unstable-small", "type": "indirect" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1673800717, - "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": [ - "utils" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1677832802, - "narHash": "sha256-XQf+k6mBYTiQUjWRf/0fozy5InAs03O1b30adCpWeXs=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "382bee738397ca005206eefa36922cc10df8a21c", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { - "naersk": "naersk", - "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks", - "utils": "utils" - } - }, - "utils": { - "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs" } } }, @@ -5,75 +5,48 @@ }; inputs = { - utils.url = "github:numtide/flake-utils"; - naersk = { - url = "github:nix-community/naersk"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - pre-commit-hooks = { - url = "github:cachix/pre-commit-hooks.nix"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "utils"; + nixpkgs.url = "nixpkgs/nixos-unstable-small"; + flake-compat = { + url = "github:edolstra/flake-compat"; + flake = false; }; }; - outputs = { - self, - nixpkgs, - utils, - naersk, - pre-commit-hooks, - ... - }: let - supportedSystems = with utils.lib.system; [ - x86_64-linux - x86_64-darwin - aarch64-linux - aarch64-darwin + outputs = {nixpkgs, ...}: let + systems = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-linux" + "aarch64-darwin" ]; + + forAllSystems = nixpkgs.lib.genAttrs systems; + nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;}); + packageSet = pkgs: with pkgs; rec { - treefetch = callPackage ./pkgs/treefetch.nix {inherit naersk;}; + treefetch = callPackage ./pkgs/treefetch.nix {}; material-color-utilities = callPackage ./pkgs/material-color-utilities.nix {}; gradience = callPackage ./pkgs/gradience.nix {inherit material-color-utilities;}; - swhkd = callPackage ./pkgs/swhkd.nix {inherit naersk;}; + swhkd = callPackage ./pkgs/swhkd {}; vim-just = callPackage ./pkgs/vim-just.nix {}; }; + overrides = prev: { discord = import ./pkgs/discord.nix prev; discord-canary = import ./pkgs/discord-canary.nix prev; }; - in - utils.lib.eachSystem supportedSystems (system: let - pkgs = import nixpkgs {inherit system;}; - in { - checks = { - pre-commit-check = pre-commit-hooks.lib.${system}.run { - src = ./.; - hooks = { - # formatting is taken care of by gh actions :) - deadnix.enable = true; - markdownlint.enable = true; - }; - }; - }; + in { + formatter = forAllSystems (system: nixpkgsFor.${system}.alejandra); - devShells.default = pkgs.mkShell { - inherit (self.checks.${system}.pre-commit-check) shellHook; - packages = with pkgs; [ - nodePackages.markdownlint-cli - deadnix - ]; - }; - - formatter = pkgs.alejandra; - - packages = let + packages = forAllSystems ( + system: let + pkgs = nixpkgsFor.${system}; p = packageSet pkgs; in - p // {default = p.treefetch;}; - }) - // { - overlays.default = final: prev: packageSet final // overrides prev; - }; + p // {default = p.treefetch;} + ); + + overlays.default = final: prev: packageSet final // overrides prev; + }; } diff --git a/pkgs/swhkd.nix b/pkgs/swhkd.nix deleted file mode 100644 index f4c35cc..0000000 --- a/pkgs/swhkd.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - callPackage, - fetchFromGitHub, - naersk, - polkit, - xorg, -}: let - version = "1.2.1"; - package = (callPackage naersk {}).buildPackage { - buildInputs = [ - polkit - xorg.xf86inputevdev - ]; - src = fetchFromGitHub { - owner = "waycrate"; - repo = "swhkd"; - rev = version; - sha256 = "sha256-VQW01j2RxhLUx59LAopZEdA7TyZBsJrF1Ym3LumvFqA="; - }; - }; -in - package - // (let - inherit (lib) licenses maintainers platforms; - in { - meta = - package.meta - // { - description = "Sxhkd clone for Wayland"; - longDescription = "a display protocol-independent hotkey daemon made in Rust"; - homepage = "https://github.com/waycrate/swhkd"; - license = licenses.bsd2; - maintainers = with maintainers; [getchoo]; - platforms = platforms.linux; - }; - }) diff --git a/pkgs/swhkd/default.nix b/pkgs/swhkd/default.nix new file mode 100644 index 0000000..96a79c9 --- /dev/null +++ b/pkgs/swhkd/default.nix @@ -0,0 +1,40 @@ +{ + lib, + fetchFromGitHub, + polkit, + rustPlatform, + xorg, +}: let + inherit (rustPlatform) buildRustPackage; + inherit (lib) licenses maintainers platforms; +in + buildRustPackage rec { + pname = "swhkd"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "waycrate"; + repo = "swhkd"; + rev = version; + sha256 = "sha256-VQW01j2RxhLUx59LAopZEdA7TyZBsJrF1Ym3LumvFqA="; + }; + + cargoPatches = [ + ./update-lock.patch + ]; + cargoSha256 = "sha256-h8n4qB6n4et7d1CfIwam8y9A1gH9lsqZD50t9YI1ieM="; + + buildInputs = [ + polkit + xorg.xf86inputevdev + ]; + + meta = { + description = "Sxhkd clone for Wayland"; + longDescription = "a display protocol-independent hotkey daemon made in Rust"; + homepage = "https://github.com/waycrate/swhkd"; + license = licenses.bsd2; + maintainers = with maintainers; [getchoo]; + platforms = platforms.linux; + }; + } diff --git a/pkgs/swhkd/update-lock.patch b/pkgs/swhkd/update-lock.patch new file mode 100644 index 0000000..a0b1f72 --- /dev/null +++ b/pkgs/swhkd/update-lock.patch @@ -0,0 +1,670 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 0accf2b..09c9908 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -4,7 +4,7 @@ version = 3 + + [[package]] + name = "Simple-Wayland-HotKey-Daemon" +-version = "1.2.0" ++version = "1.2.1" + dependencies = [ + "clap", + "env_logger", +@@ -21,9 +21,9 @@ dependencies = [ + + [[package]] + name = "aho-corasick" +-version = "0.7.18" ++version = "0.7.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" ++checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" + dependencies = [ + "memchr", + ] +@@ -34,7 +34,7 @@ version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" + dependencies = [ +- "hermit-abi", ++ "hermit-abi 0.1.19", + "libc", + "winapi", + ] +@@ -65,15 +65,15 @@ dependencies = [ + + [[package]] + name = "bytes" +-version = "1.1.0" ++version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" ++checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + + [[package]] + name = "cc" +-version = "1.0.73" ++version = "1.0.79" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" ++checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + + [[package]] + name = "cfg-if" +@@ -83,9 +83,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "clap" +-version = "3.2.12" ++version = "3.2.23" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ab8b79fe3946ceb4a0b1c080b4018992b8d27e9ff363644c1c9b6387c854614d" ++checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" + dependencies = [ + "atty", + "bitflags", +@@ -107,15 +107,15 @@ dependencies = [ + + [[package]] + name = "core-foundation-sys" +-version = "0.8.3" ++version = "0.8.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" ++checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + + [[package]] + name = "crossbeam-channel" +-version = "0.5.5" ++version = "0.5.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c" ++checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" + dependencies = [ + "cfg-if", + "crossbeam-utils", +@@ -123,9 +123,9 @@ dependencies = [ + + [[package]] + name = "crossbeam-deque" +-version = "0.8.1" ++version = "0.8.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" ++checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" + dependencies = [ + "cfg-if", + "crossbeam-epoch", +@@ -134,39 +134,37 @@ dependencies = [ + + [[package]] + name = "crossbeam-epoch" +-version = "0.9.9" ++version = "0.9.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d" ++checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" + dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", +- "memoffset", +- "once_cell", ++ "memoffset 0.8.0", + "scopeguard", + ] + + [[package]] + name = "crossbeam-utils" +-version = "0.8.10" ++version = "0.8.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83" ++checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" + dependencies = [ + "cfg-if", +- "once_cell", + ] + + [[package]] + name = "either" +-version = "1.7.0" ++version = "1.8.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" ++checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + + [[package]] + name = "env_logger" +-version = "0.9.0" ++version = "0.9.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" ++checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" + dependencies = [ + "atty", + "humantime", +@@ -177,14 +175,16 @@ dependencies = [ + + [[package]] + name = "evdev" +-version = "0.11.4" ++version = "0.11.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "21eef104bd659ef808f1f84bed9a924e1aebcdd066845b377cd3b52cc497bb9f" ++checksum = "c574a78f2156dbd8d6c1bab4bf43f251bffdd84c3b3682ebe82e413fdfec76fe" + dependencies = [ + "bitvec", ++ "cfg-if", + "futures-core", + "libc", + "nix", ++ "thiserror", + "tokio", + ] + +@@ -196,15 +196,15 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + + [[package]] + name = "futures-core" +-version = "0.3.21" ++version = "0.3.28" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" ++checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + + [[package]] + name = "hashbrown" +-version = "0.12.2" ++version = "0.12.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "607c8a29735385251a339424dd462993c0fed8fa09d378f259377df08c126022" ++checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + + [[package]] + name = "hermit-abi" +@@ -215,6 +215,15 @@ dependencies = [ + "libc", + ] + ++[[package]] ++name = "hermit-abi" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" ++dependencies = [ ++ "libc", ++] ++ + [[package]] + name = "humantime" + version = "2.1.0" +@@ -223,9 +232,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + + [[package]] + name = "indexmap" +-version = "1.9.1" ++version = "1.9.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" ++checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" + dependencies = [ + "autocfg", + "hashbrown", +@@ -233,24 +242,24 @@ dependencies = [ + + [[package]] + name = "itertools" +-version = "0.10.3" ++version = "0.10.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" ++checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" + dependencies = [ + "either", + ] + + [[package]] + name = "libc" +-version = "0.2.126" ++version = "0.2.141" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" ++checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" + + [[package]] + name = "lock_api" +-version = "0.4.7" ++version = "0.4.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" ++checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" + dependencies = [ + "autocfg", + "scopeguard", +@@ -280,11 +289,20 @@ dependencies = [ + "autocfg", + ] + ++[[package]] ++name = "memoffset" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" ++dependencies = [ ++ "autocfg", ++] ++ + [[package]] + name = "mio" +-version = "0.8.4" ++version = "0.8.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" ++checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" + dependencies = [ + "libc", + "log", +@@ -294,15 +312,15 @@ dependencies = [ + + [[package]] + name = "nix" +-version = "0.23.1" ++version = "0.23.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" ++checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" + dependencies = [ + "bitflags", + "cc", + "cfg-if", + "libc", +- "memoffset", ++ "memoffset 0.6.5", + ] + + [[package]] +@@ -316,25 +334,25 @@ dependencies = [ + + [[package]] + name = "num_cpus" +-version = "1.13.1" ++version = "1.15.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" ++checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" + dependencies = [ +- "hermit-abi", ++ "hermit-abi 0.2.6", + "libc", + ] + + [[package]] + name = "once_cell" +-version = "1.13.0" ++version = "1.17.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" ++checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + + [[package]] + name = "os_str_bytes" +-version = "6.1.0" ++version = "6.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa" ++checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" + + [[package]] + name = "parking_lot" +@@ -348,9 +366,9 @@ dependencies = [ + + [[package]] + name = "parking_lot_core" +-version = "0.9.3" ++version = "0.9.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" ++checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" + dependencies = [ + "cfg-if", + "libc", +@@ -367,18 +385,18 @@ checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + + [[package]] + name = "proc-macro2" +-version = "1.0.40" ++version = "1.0.56" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" ++checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" + dependencies = [ + "unicode-ident", + ] + + [[package]] + name = "quote" +-version = "1.0.20" ++version = "1.0.26" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" ++checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" + dependencies = [ + "proc-macro2", + ] +@@ -391,21 +409,19 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + + [[package]] + name = "rayon" +-version = "1.5.3" ++version = "1.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" ++checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" + dependencies = [ +- "autocfg", +- "crossbeam-deque", + "either", + "rayon-core", + ] + + [[package]] + name = "rayon-core" +-version = "1.9.3" ++version = "1.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" ++checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" + dependencies = [ + "crossbeam-channel", + "crossbeam-deque", +@@ -415,18 +431,18 @@ dependencies = [ + + [[package]] + name = "redox_syscall" +-version = "0.2.13" ++version = "0.2.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" ++checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" + dependencies = [ + "bitflags", + ] + + [[package]] + name = "regex" +-version = "1.6.0" ++version = "1.7.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" ++checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" + dependencies = [ + "aho-corasick", + "memchr", +@@ -435,9 +451,9 @@ dependencies = [ + + [[package]] + name = "regex-syntax" +-version = "0.6.27" ++version = "0.6.29" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" ++checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + + [[package]] + name = "scopeguard" +@@ -447,9 +463,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + + [[package]] + name = "signal-hook" +-version = "0.3.14" ++version = "0.3.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" ++checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" + dependencies = [ + "libc", + "signal-hook-registry", +@@ -457,9 +473,9 @@ dependencies = [ + + [[package]] + name = "signal-hook-registry" +-version = "1.4.0" ++version = "1.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" ++checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" + dependencies = [ + "libc", + ] +@@ -478,15 +494,15 @@ dependencies = [ + + [[package]] + name = "smallvec" +-version = "1.9.0" ++version = "1.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" ++checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + + [[package]] + name = "socket2" +-version = "0.4.4" ++version = "0.4.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" ++checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" + dependencies = [ + "libc", + "winapi", +@@ -500,7 +516,7 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + + [[package]] + name = "swhks" +-version = "1.2.0" ++version = "1.2.1" + dependencies = [ + "env_logger", + "log", +@@ -510,9 +526,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "1.0.98" ++version = "2.0.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" ++checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" + dependencies = [ + "proc-macro2", + "quote", +@@ -542,45 +558,63 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + + [[package]] + name = "termcolor" +-version = "1.1.3" ++version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" ++checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" + dependencies = [ + "winapi-util", + ] + + [[package]] + name = "textwrap" +-version = "0.15.0" ++version = "0.16.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" ++checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" ++ ++[[package]] ++name = "thiserror" ++version = "1.0.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] + + [[package]] + name = "tokio" +-version = "1.20.0" ++version = "1.27.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "57aec3cfa4c296db7255446efb4928a6be304b431a806216105542a67b6ca82e" ++checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" + dependencies = [ + "autocfg", + "bytes", + "libc", +- "memchr", + "mio", + "num_cpus", +- "once_cell", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", +- "winapi", ++ "windows-sys", + ] + + [[package]] + name = "tokio-macros" +-version = "1.8.0" ++version = "2.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" ++checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" + dependencies = [ + "proc-macro2", + "quote", +@@ -589,9 +623,9 @@ dependencies = [ + + [[package]] + name = "tokio-stream" +-version = "0.1.9" ++version = "0.1.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" ++checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" + dependencies = [ + "futures-core", + "pin-project-lite", +@@ -600,9 +634,9 @@ dependencies = [ + + [[package]] + name = "unicode-ident" +-version = "1.0.1" ++version = "1.0.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" ++checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" + + [[package]] + name = "wasi" +@@ -643,52 +677,75 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + + [[package]] + name = "windows-sys" +-version = "0.36.1" ++version = "0.45.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" ++checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" + dependencies = [ ++ "windows-targets", ++] ++ ++[[package]] ++name = "windows-targets" ++version = "0.42.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" ++dependencies = [ ++ "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", ++ "windows_x86_64_gnullvm", + "windows_x86_64_msvc", + ] + ++[[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.42.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" ++ + [[package]] + name = "windows_aarch64_msvc" +-version = "0.36.1" ++version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" ++checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + + [[package]] + name = "windows_i686_gnu" +-version = "0.36.1" ++version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" ++checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + + [[package]] + name = "windows_i686_msvc" +-version = "0.36.1" ++version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" ++checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + + [[package]] + name = "windows_x86_64_gnu" +-version = "0.36.1" ++version = "0.42.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" ++ ++[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" ++checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + + [[package]] + name = "windows_x86_64_msvc" +-version = "0.36.1" ++version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" ++checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + + [[package]] + name = "wyz" +-version = "0.5.0" ++version = "0.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" ++checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" + dependencies = [ + "tap", + ] diff --git a/pkgs/treefetch.nix b/pkgs/treefetch.nix index 247354d..35545ac 100644 --- a/pkgs/treefetch.nix +++ b/pkgs/treefetch.nix @@ -1,30 +1,32 @@ { lib, - callPackage, fetchFromGitHub, - naersk, + rustPlatform, }: let commit = "02f65e11e1f23d5fa9e66335eb5ff4f2f6b01400"; - package = (callPackage naersk {}).buildPackage { + inherit (rustPlatform) buildRustPackage; + inherit (lib) licenses maintainers platforms; + inherit (builtins) substring; +in + buildRustPackage rec { + pname = "treefetch"; + version = substring 0 7 commit; + src = fetchFromGitHub { owner = "angelofallars"; repo = "treefetch"; rev = commit; sha256 = "sha256-FDiulTit492KwV46A3qwjHQwzpjVJvIXTfTrMufXd5k="; }; - }; -in - with lib; - package - // { - meta = - package.meta - // { - description = "A plant-based system fetch tool made with Rust."; - longDescription = "A comfy and fast system fetch tool made in Rust. Tested to be much faster than neofetch and pfetch."; - homepage = "https://github.com/angelofallars/treefetch"; - license = licenses.gpl3; - maintainers = with maintainers; [getchoo]; - platforms = platforms.all; - }; - } + + cargoLock.lockFile = "${src}/Cargo.lock"; + + meta = { + description = "A plant-based system fetch tool made with Rust."; + longDescription = "A comfy and fast system fetch tool made in Rust. Tested to be much faster than neofetch and pfetch."; + homepage = "https://github.com/angelofallars/treefetch"; + license = licenses.gpl3; + maintainers = with maintainers; [getchoo]; + platforms = platforms.unix; + }; + } |